Fixed test and compile errors

Author: BitcoderCZ

FanScript/Compiler/Binding/Binder.cs

@@ -525,7 +525,7 @@ private BoundStatement BindBreakStatement(BreakStatementSyntax syntax)
             }
 
             BoundLabel breakLabel = loopStack.Peek().BreakLabel;
-            return new BoundGotoStatement(syntax, breakLabel);
+            return new BoundGotoStatement(syntax, breakLabel, false);
         }
 
         private BoundStatement BindContinueStatement(ContinueStatementSyntax syntax)
@@ -542,7 +542,7 @@ private BoundStatement BindContinueStatement(ContinueStatementSyntax syntax)
             }
 
             BoundLabel continueLabel = loopStack.Peek().ContinueLabel;
-            return new BoundGotoStatement(syntax, continueLabel);
+            return new BoundGotoStatement(syntax, continueLabel, false);
         }
 
         private BoundStatement BindReturnStatement(ReturnStatementSyntax syntax)
@@ -705,43 +705,6 @@ TypeSymbol fixType(TypeSymbol type)
             }
         }
 
-        private TypeSymbol BindTypeClause(TypeClauseSyntax? syntax)
-        {
-            if (syntax is null)
-                return TypeSymbol.Error;
-
-            TypeSymbol? type = LookupType(syntax.TypeToken.Text);
-            if (type is null)
-            {
-                diagnostics.ReportUndefinedType(syntax.Location, syntax.TypeToken.Text);
-                type = TypeSymbol.Error;
-            }
-
-            if (syntax.HasGenericParameter)
-            {
-                if (type.IsGenericDefinition)
-                {
-                    TypeSymbol? innerType = BindTypeClause(syntax.InnerType);
-                    if (innerType is null)
-                        return TypeSymbol.Error;
-                    else
-                        return TypeSymbol.CreateGenericInstance(type, innerType);
-                }
-                else
-                {
-                    diagnostics.ReportNotAGenericType(new TextLocation(syntax.SyntaxTree.Text, TextSpan.FromBounds(syntax.LessToken.Span.Start, syntax.GreaterToken.Span.End)));
-                    return TypeSymbol.Error;
-                }
-            }
-            else if (type.IsGenericDefinition)
-            {
-                diagnostics.ReportTypeMustHaveGenericParameter(syntax.Location);
-                return TypeSymbol.Error;
-            }
-
-            return type;
-        }
-
         private BoundStatement BindExpressionStatement(ExpressionStatementSyntax syntax)
         {
             BoundExpression expression = BindExpression(syntax.Expression, canBeVoid: true);
@@ -1189,6 +1152,43 @@ private VariableSymbol BindVariableDeclaration(SyntaxToken identifier, ModifierC
             }
         }
 
+        private TypeSymbol BindTypeClause(TypeClauseSyntax? syntax)
+        {
+            if (syntax is null)
+                return TypeSymbol.Error;
+
+            TypeSymbol? type = LookupType(syntax.TypeToken.Text);
+            if (type is null)
+            {
+                diagnostics.ReportUndefinedType(syntax.Location, syntax.TypeToken.Text);
+                type = TypeSymbol.Error;
+            }
+
+            if (syntax.HasGenericParameter)
+            {
+                if (type.IsGenericDefinition)
+                {
+                    TypeSymbol? innerType = BindTypeClause(syntax.InnerType);
+                    if (innerType is null)
+                        return TypeSymbol.Error;
+                    else
+                        return TypeSymbol.CreateGenericInstance(type, innerType);
+                }
+                else
+                {
+                    diagnostics.ReportNotAGenericType(new TextLocation(syntax.SyntaxTree.Text, TextSpan.FromBounds(syntax.LessToken.Span.Start, syntax.GreaterToken.Span.End)));
+                    return TypeSymbol.Error;
+                }
+            }
+            else if (type.IsGenericDefinition)
+            {
+                diagnostics.ReportTypeMustHaveGenericParameter(syntax.Location);
+                return TypeSymbol.Error;
+            }
+
+            return type;
+        }
+
         private TypeSymbol? LookupType(string name)
         {
             TypeSymbol type = TypeSymbol.GetType(name);
@@ -1357,6 +1357,8 @@ private BoundModifierClause BindModifierClause(ModifierClauseSyntax modifierClau
                     diagnostics.ReportDuplicateModifier(token.Location, modifier);
                     modifiersAndTokens.RemoveAt(i--);
                 }
+                else
+                    modifiers |= modifier;
             }
 
             return new BoundModifierClause(modifierClause, modifiersAndTokens.ToImmutableArray());

FanScript/Compiler/Binding/ControlFlowGraph.cs

@@ -94,7 +94,6 @@ public List<BasicBlock> Build(BoundBlockStatement block)
                             statements.Add(statement);
                             break;
                         case BoundGotoStatement:
-                        case BoundRollbackGotoStatement:
                         case BoundEventGotoStatement:
                         case BoundConditionalGotoStatement:
                         case BoundReturnStatement:
@@ -179,12 +178,6 @@ public ControlFlowGraph Build(List<BasicBlock> blocks)
                                     connect(current, toBlock);
                                 }
                                 break;
-                            case BoundRollbackGotoStatement rollbackGotoStatement:
-                                {
-                                    BasicBlock toBlock = blockFromLabel[rollbackGotoStatement.Label];
-                                    connect(current, toBlock);
-                                }
-                                break;
                             case BoundEventGotoStatement eventGotoStatement:
                                 {
                                     BasicBlock thenBlock = blockFromLabel[eventGotoStatement.Label];