'else' fixed, along with semicolon handling

git-svn-id: http://picoc.googlecode.com/svn/trunk@175 21eae674-98b7-11dd-bd71-f92a316d2d60
friendzis · Mar 9, 2009 · 1b31254 · 1b31254
1 parent 08cd7e8
commit 1b31254
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/TODO b/TODO
@@ -4,7 +4,6 @@ Bugs:
 * defining functions returning void
 * defining functions from interactive mode
 * defining functions with no parameters (in interactive mode?)
-* 'else' is broken
 * int fact(int i) {
    if (i < 2) {
        return i;

diff --git a/parse.c b/parse.c
@@ -175,9 +175,6 @@ void ParseFor(struct ParseState *Parser)
     if (!ParseStatement(Parser))
         ProgramFail(Parser, "statement expected");
 
-    if (LexGetToken(Parser, NULL, TRUE) != TokenSemicolon)
-        ProgramFail(Parser, "';' expected");
-
     ParserCopyPos(&PreConditional, Parser);
     Condition = ExpressionParseInt(Parser);
 
@@ -254,6 +251,7 @@ int ParseStatement(struct ParseState *Parser)
 {
     struct Value *CValue;
     int Condition;
+    int CheckTrailingSemicolon = TRUE;
     struct ParseState PreState = *Parser;
     enum LexToken Token = LexGetToken(Parser, NULL, TRUE);
 
@@ -291,6 +289,7 @@ int ParseStatement(struct ParseState *Parser)
                 if (!ParseStatementMaybeRun(Parser, !Condition))
                     ProgramFail(Parser, "statement expected");
             }
+            CheckTrailingSemicolon = FALSE;
             break;
 
         case TokenWhile:
@@ -309,6 +308,8 @@ int ParseStatement(struct ParseState *Parser)
 
                 if (Parser->Mode == RunModeBreak)
                     Parser->Mode = RunModeRun;
+
+                CheckTrailingSemicolon = FALSE;
             }
             break;
 
@@ -337,6 +338,7 @@ int ParseStatement(struct ParseState *Parser)
 
         case TokenFor:
             ParseFor(Parser);
+            CheckTrailingSemicolon = FALSE;
             break;
 
         case TokenSemicolon: break;
@@ -354,6 +356,7 @@ int ParseStatement(struct ParseState *Parser)
 
         case TokenHashDefine:
             ParseMacroDefinition(Parser);
+            CheckTrailingSemicolon = FALSE;
             break;
 
         case TokenHashInclude:
@@ -363,6 +366,7 @@ int ParseStatement(struct ParseState *Parser)
                 ProgramFail(Parser, "\"filename.h\" expected");
 
             //ScanFile(LexerValue->Val->String); // XXX - need to dereference char * here
+            CheckTrailingSemicolon = FALSE;
             break;
         }
 
@@ -389,6 +393,8 @@ int ParseStatement(struct ParseState *Parser)
                 Parser->Mode = OldMode;
                 Parser->SearchLabel = OldSearchLabel;
             }
+
+            CheckTrailingSemicolon = FALSE;
             break;
 
         case TokenCase:
@@ -406,6 +412,8 @@ int ParseStatement(struct ParseState *Parser)
 
             if (Parser->Mode == RunModeCaseSearch && Condition == Parser->SearchLabel)
                 Parser->Mode = RunModeRun;
+
+            CheckTrailingSemicolon = FALSE;
             break;
 
         case TokenDefault:
@@ -414,6 +422,8 @@ int ParseStatement(struct ParseState *Parser)
 
             if (Parser->Mode == RunModeCaseSearch)
                 Parser->Mode = RunModeRun;
+
+            CheckTrailingSemicolon = FALSE;
             break;
 
         case TokenBreak:
@@ -447,6 +457,9 @@ int ParseStatement(struct ParseState *Parser)
             return FALSE;
     }
 
+    if (CheckTrailingSemicolon && LexGetToken(Parser, NULL, FALSE) == TokenSemicolon)
+        LexGetToken(Parser, NULL, TRUE);
+
     return TRUE;
 }
 

diff --git a/tests/Makefile b/tests/Makefile
@@ -10,7 +10,8 @@ TESTS=	00_assignment.test \
 	09_do_while.test \
 	10_pointer.test \
 	12_hashdefine.test \
-	13_integer_literals.test
+	13_integer_literals.test \
+	14_if.test
 
 %.test: %.expect %.c
 	@echo Test: $*...