Guard infinite recursion

exercism · Jan 30, 2025 · b7dccb8 · b7dccb8
1 parent fe67b79
commit b7dccb8
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 4 deletions.
diff --git a/app/javascript/interpreter/error.ts b/app/javascript/interpreter/error.ts
@@ -119,6 +119,7 @@ export type RuntimeErrorType =
   | 'ExpectedFunctionHasWrongArguments'
   | 'InvalidNestedFunction'
   | 'MaxIterationsReached'
+  | 'InfiniteRecursion'
 
 export type StaticErrorType =
   | DisabledLanguageFeatureErrorType

diff --git a/app/javascript/interpreter/executor/executeCallExpression.ts b/app/javascript/interpreter/executor/executeCallExpression.ts
@@ -106,9 +106,12 @@ export function executeCallExpression(
   } catch (e) {
     if (e instanceof FunctionCallTypeMismatchError) {
       executor.error('FunctionCallTypeMismatch', expression.location, e.context)
-    }
-    if (e instanceof LogicError) {
+    } else if (e instanceof LogicError) {
       executor.error('LogicError', expression.location, { message: e.message })
+    } else if (e instanceof RangeError) {
+      executor.error('InfiniteRecursion', expression.location, {
+        message: e.message,
+      })
     } else {
       throw e
     }

diff --git a/app/javascript/interpreter/locales/en/translation.json b/app/javascript/interpreter/locales/en/translation.json
@@ -98,7 +98,8 @@
       "FunctionCallTypeMismatch": "Jiki expected input {{argIdx}} to be a {{expectedType}} but it was actually a {{actualType}}.",
       "UnexpectedReturnOutsideOfFunction": "You used the `return` keyword, but you're not inside a function. So Jiki has nothing to return out from.",
       "ExpectedFunctionNotFound": "Jiki couldn't find the `{{name}}` function. Have you defined it correctly?",
-      "ExpectedFunctionHasWrongArguments": "Jiki tried to run the `{{name}}` function but it had a different amount of inputs to what he expected."
+      "ExpectedFunctionHasWrongArguments": "Jiki tried to run the `{{name}}` function but it had a different amount of inputs to what he expected.",
+      "InfiniteRecursion": "Jiki kept on running the same code over and over again. Do you have a function that is somehow trying to use itself?"
     },
     "disabledLanguageFeature": {
       "ExcludeListViolation": "Jiki doesn't know how to use `{{lexeme}}` in this exercise.",

diff --git a/app/javascript/interpreter/locales/system/translation.json b/app/javascript/interpreter/locales/system/translation.json
@@ -98,7 +98,8 @@
       "ExpectedFunctionHasWrongArguments": "ExpectedFunctionHasWrongArguments: name: {{name}}",
       "ExpectedFunctionNotFound": "ExpectedFunctionNotFound: name: {{name}}",
       "VariableNotAccessibleInFunction": "VariableNotAccessibleInFunction: name: {{name}}",
-      "InvalidNestedFunction": "InvalidNestedFunction"
+      "InvalidNestedFunction": "InvalidNestedFunction",
+      "InfiniteRecursion": "InfiniteRecursion"
     },
     "disabledLanguageFeature": {
       "ExcludeListViolation": "ExcludeListViolation: tokenType: {{tokenType}}",

diff --git a/test/javascript/interpreter/runtimeErrors.test.ts b/test/javascript/interpreter/runtimeErrors.test.ts
@@ -183,4 +183,13 @@ describe('Runtime errors', () => {
       `MaxIterationsReached: maxIterations: ${maxIterations}`
     )
   })
+  test('InfiniteRecursion', () => {
+    const code = `function foo do
+                    foo()
+                  end
+                  foo()`
+    const { frames } = interpret(code)
+    expectFrameToBeError(frames[0], 'foo()', 'InfiniteRecursion')
+    expect(frames[0].error!.message).toBe('InfiniteRecursion')
+  })
 })