Fixed an issue with certain actions being misinterpreted

YarnSpinnerTool · Jul 19, 2017 · 97d9add · 97d9add
1 parent eaa12f3
commit 97d9add
Show file tree

Hide file tree

Showing 7 changed files with 731 additions and 701 deletions.
diff --git a/ANTLR/YarnSpinnerLexer.g4 b/ANTLR/YarnSpinnerLexer.g4
@@ -78,7 +78,8 @@ INDENT : '\u0007';
 DEDENT : '\u000B';
 
 COMMAND_IF : COMMAND_OPEN KEYWORD_IF -> pushMode(Command) ;
-COMMAND_ELSE : COMMAND_OPEN KEYWORD_ELSE -> pushMode(Command) ;
+//COMMAND_ELSE : COMMAND_OPEN KEYWORD_ELSE -> pushMode(Command) ;
+COMMAND_ELSE : COMMAND_OPEN KEYWORD_ELSE COMMAND_CLOSE | '<<else>>' | '<<ELSE>>' ;
 COMMAND_ELSE_IF : COMMAND_OPEN KEYWORD_ELSE_IF -> pushMode(Command) ;
 COMMAND_ENDIF : COMMAND_OPEN ('endif' | 'ENDIF') '>>' ;
 COMMAND_SET : COMMAND_OPEN KEYWORD_SET -> pushMode(Command) ;

diff --git a/ANTLR/YarnSpinnerParser.g4 b/ANTLR/YarnSpinnerParser.g4
@@ -38,7 +38,7 @@ shortcut_text : SHORTCUT_TEXT ;
 if_statement : if_clause (else_if_clause)* (else_clause)? COMMAND_ENDIF (hashtag_block)? ;
 if_clause : COMMAND_IF expression COMMAND_CLOSE statement* ;
 else_if_clause : COMMAND_ELSE_IF expression COMMAND_CLOSE statement* ;
-else_clause : COMMAND_ELSE COMMAND_CLOSE statement* ;
+else_clause : COMMAND_ELSE statement* ;
 
 // this is a hack until I can work out exactly what the rules for setting are
 set_statement

diff --git a/YarnSpinner/AntlrCompiler.cs b/YarnSpinner/AntlrCompiler.cs
@@ -350,9 +350,26 @@ public override int VisitSet_statement(YarnSpinnerParser.Set_statementContext co
         public override int VisitAction_statement(YarnSpinnerParser.Action_statementContext context)
         {
             char[] trimming = { '<', '>' };
-            compiler.Emit(ByteCode.RunCommand, context.GetText().Trim(trimming));
+            string action = context.GetText().Trim(trimming);
 
-            return 0;
+            // TODO: look into replacing this as it seems a bit odd
+            switch (action)
+            {
+                case "stop":
+                    compiler.Emit(ByteCode.Stop);
+                    break;
+                case "shuffleNextOptions":
+                    compiler.Emit(ByteCode.PushBool, true);
+                    compiler.Emit(ByteCode.StoreVariable, VirtualMachine.SpecialVariables.ShuffleOptions);
+                    compiler.Emit(ByteCode.Pop);
+                    compiler.flags.DisableShuffleOptionsAfterNextSet = true;
+                    break;
+                default:
+                    compiler.Emit(ByteCode.RunCommand, action);
+                    break;
+            }
+
+			return 0;
         }
 
         // solo function statements

diff --git a/YarnSpinner/YarnSpinnerLexer.cs b/YarnSpinner/YarnSpinnerLexer.cs
diff --git a/YarnSpinner/YarnSpinnerLexer.g4 b/YarnSpinner/YarnSpinnerLexer.g4
@@ -78,7 +78,8 @@ INDENT : '\u0007';
 DEDENT : '\u000B';
 
 COMMAND_IF : COMMAND_OPEN KEYWORD_IF -> pushMode(Command) ;
-COMMAND_ELSE : COMMAND_OPEN KEYWORD_ELSE -> pushMode(Command) ;
+//COMMAND_ELSE : COMMAND_OPEN KEYWORD_ELSE -> pushMode(Command) ;
+COMMAND_ELSE : COMMAND_OPEN KEYWORD_ELSE COMMAND_CLOSE | '<<else>>' | '<<ELSE>>' ;
 COMMAND_ELSE_IF : COMMAND_OPEN KEYWORD_ELSE_IF -> pushMode(Command) ;
 COMMAND_ENDIF : COMMAND_OPEN ('endif' | 'ENDIF') '>>' ;
 COMMAND_SET : COMMAND_OPEN KEYWORD_SET -> pushMode(Command) ;