Braces fixed again

ptytb · Mar 31, 2014 · be4b857 · be4b857
1 parent 6091b6d
commit be4b857
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 12 deletions.
diff --git a/byond2Lexer.g4 b/byond2Lexer.g4
@@ -3,6 +3,10 @@ import byond2Common;
 
 ////////////////////////////////////////////////////////////////////////////////
 // token flow control
+@lexer::header
+{
+    import java.util.Stack;
+}
 
 @lexer::members
 {
@@ -12,6 +16,10 @@ import byond2Common;
     private int prevTokenType = EOF;
     private String fileName = null;
     private int macroStartCharPositionInLine;
+    private int nestingBraces = 0;
+    private int indentLevelBraced = 0;
+    private Stack<Integer> indentLevelBracedStack = 
+        new Stack<Integer>();
 
     @Override
     public String getSourceName()
@@ -31,6 +39,11 @@ import byond2Common;
 
     private void indent(int n)
     {
+        if (nestingBraces > 0)
+        {
+            indentLevelBraced += n;
+        }
+
         indentLevel += n;
         while (n > 0)
         {
@@ -41,6 +54,11 @@ import byond2Common;
 
     private void dedent(int n)
     {
+        if (nestingBraces > 0)
+        {
+            indentLevelBraced -= n;
+        }
+
         indentLevel -= n;
         while (n > 0)
         {
@@ -192,6 +210,32 @@ import byond2Common;
                     parseMacroLine(macro);
                     break;
 
+                case LCURV:
+                    nestingBraces++;
+
+                    indentLevelBracedStack.push(indentLevelBraced);
+                    indentLevelBraced = 0;
+
+                    pendingTokens.add(token);
+                    break;
+
+                case RCURV: 
+                    if (indentLevelBraced > 0)
+                    {
+                        dedent(indentLevelBraced);
+                        indentLevelBraced = 0;
+                    }
+
+                    nestingBraces--;
+
+                    if (!indentLevelBracedStack.isEmpty())
+                    {
+                        indentLevelBraced = indentLevelBracedStack.pop();
+                    }
+
+                    pendingTokens.add(token);
+                    break;
+
                 case EOF:
                     dedentAll();
 

diff --git a/byond2Parser.g4 b/byond2Parser.g4
@@ -37,16 +37,10 @@ statementLine
     :   statement (SEMI statement?)*
     ;
 
-blockBracedEnd
-    :   
-    (   RCURV (newline? DEDENT)? (newline? DEDENT)*?
-    |   (DEDENT newline)* RCURV)
-    ;
-
 blockBraced
     :   LCURV statementLine?
     (   RCURV
-    |   (newline (INDENT (blockInner newline?)?)?)? blockBracedEnd)
+    |   (newline (INDENT (blockInner newline?)? DEDENT newline)?)? RCURV)
     ;
 
 blockIndented
@@ -87,7 +81,7 @@ statementProcLine
 blockBracedProc
     :   LCURV statementProcLine?
     (   RCURV
-    |   (newline (INDENT (blockInnerProc newline?)?)?)? blockBracedEnd)
+    |   (newline (INDENT (blockInnerProc newline?)? DEDENT newline)?)? RCURV)
     ;
 
 blockIndentedProc

diff --git a/testf.sh b/testf.sh
@@ -5,8 +5,6 @@
 #java -Xmx512M -cp .:/media/usb3/media/download/antlr-4.2-complete.jar Main $1
 
 java -Xmx768M -cp .:/media/usb3/media/download/antlr-4.2-complete.jar Main \
-"/media/usb3/Baystation12/Baystation12/code/modules/awaymissions/maploader/writer.dm"
-#"/media/usb3/Baystation12/Baystation12/code/__HELPERS/icons.dm"
-#/media/usb3/Baystation12/Baystation12/code/modules/awaymissions/maploader/dmm_suite.dm
-#"/media/usb3/byond-port/test.dm"
+"/media/usb3/byond-port/test.dm"
+#"/media/usb3/byond-port/test.pre"
 #"/media/usb3/Baystation12/Baystation12/baystation12.dme"