Prevent functions from throwing loop control flow exceptions; convert them into StormRuntimeError. SYN-8397

synapse/lib/ast.py

@@ -4972,6 +4972,11 @@
 
                 except s_stormctrl.StormReturn as e:
                     return e.item
+                except s_stormctrl.StormCtrlFlow as e:
+                    if isinstance(e, s_stormctrl.StormLoopCtrl):
+                        mesg = f'{self.name} - Functions are not allowed to use unhandled loop control flow statements - {e._statement}'
+                        raise s_exc.StormRuntimeError(mesg=mesg) from e
+                    raise
 
         async def genr():
             async with runt.getSubRuntime(self.kids[2], opts=opts) as subr:
@@ -4991,5 +4996,10 @@
                                 yield node, path
                 except s_stormctrl.StormStop:
                     return
+                except s_stormctrl.StormCtrlFlow as e:
+                    if isinstance(e, s_stormctrl.StormLoopCtrl):
+                        mesg = f'{self.name} - Functions are not allowed to use unhandled loop control flow statements - {e._statement}'
+                        raise s_exc.StormRuntimeError(mesg=mesg) from e
+                    raise
 
         return genr()

synapse/lib/stormctrl.py

@@ -2,8 +2,15 @@ class StormCtrlFlow(Exception):
     def __init__(self, item=None):
         self.item = item
 
+class StormLoopCtrl:
+    # Control flow statements for WHILE and FOR loop control and GENERATOR controls
+    _statement = ''
+
 class StormExit(StormCtrlFlow): pass
-class StormStop(StormCtrlFlow): pass
-class StormBreak(StormCtrlFlow): pass
+class StormStop(StormCtrlFlow, StormLoopCtrl):
+    _statement = 'stop'
+class StormBreak(StormCtrlFlow, StormLoopCtrl):
+    _statement = 'break'
 class StormReturn(StormCtrlFlow): pass
-class StormContinue(StormCtrlFlow): pass
+class StormContinue(StormCtrlFlow, StormLoopCtrl):
+    _statement = 'continue'