Added parsing of OPTION EXPLICIT and OPTION BASE.

icculus · Dec 3, 2017 · 5c3db13 · 5c3db13
1 parent 3f89360
commit 5c3db13
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 4 deletions.
diff --git a/mojobasic_compiler.cpp b/mojobasic_compiler.cpp
@@ -183,7 +183,15 @@ class AstPrinterVisitor : public AstVisitor
 public:
     AstPrinterVisitor() : indent(-1) { printf("PARSER: visiting AST for pretty-printing...\n"); }
     ~AstPrinterVisitor() { printf("PARSER: ...pretty-printing visit complete.\n"); }
-    virtual void visit(AstProgram *node) { node->block->accept(this); }
+    virtual void visit(AstProgram *node) {
+        if (node->bOptionExplicit) {
+            printf("OPTION EXPLICIT\n");
+        }
+        if (node->optionBase == 0) {
+            printf("OPTION BASE 0\n");
+        }
+        node->block->accept(this);
+    }
 
     virtual void visit(AstProcedureDeclaration *node) {
         printf("DECLARE ");

diff --git a/mojobasic_internal.h b/mojobasic_internal.h
@@ -512,7 +512,10 @@ enum Token
     TOKEN_PUT,
     TOKEN_STEP,
     TOKEN_USING,
-    TOKEN_WEND
+    TOKEN_WEND,
+    TOKEN_OPTION,
+    TOKEN_EXPLICIT,
+    TOKEN_BASE
 };
 
 

diff --git a/mojobasic_internal_llvm.h b/mojobasic_internal_llvm.h
@@ -510,10 +510,12 @@ struct AstOnErrorStatement : public AstStatement
 
 struct AstProgram : public AstNode
 {
-    AstProgram(const SourcePosition &pos, AstStatementBlock *_block) : AstNode(pos), block(_block) {}
+    AstProgram(const SourcePosition &pos, AstStatementBlock *_block, const bool _bOptionExplicit, const int _optionBase) : AstNode(pos), block(_block), bOptionExplicit(_bOptionExplicit), optionBase(_optionBase) {}
     virtual ~AstProgram() { delete block; }
     virtual void accept(AstVisitor *visitor) { visitor->visit(this); }
     AstStatementBlock *block;
+    const bool bOptionExplicit;
+    const int optionBase;
 };
 
 void failCompile(void *c, const char *err, const SourcePosition &pos);

diff --git a/mojobasic_parser.cpp b/mojobasic_parser.cpp
@@ -57,6 +57,8 @@ class Parser
         , strcache(_strcache)
         , bPushedBack(false)
         , bWasNumericLabel(false)
+        , optionExplicit(-1)
+        , optionBase(-1)
     {}
 
     ~Parser() { assert(pp == NULL); }
@@ -98,6 +100,7 @@ class Parser
     AstDefStatement *parseDefStr() { return parseDefType("STR"); }
     AstStatement *parseOnError(const bool bLocal);
     AstStatement *parseOn();
+    void parseOption();
     AstSubCallStatement *parseOpen();
     AstSubCallStatement *parseClose();
     AstSubCallStatement *parsePrint();
@@ -127,6 +130,8 @@ class Parser
     TokenData pushbackToken;
     bool bPushedBack;
     bool bWasNumericLabel;
+    int optionExplicit;
+    int optionBase;
 };
 
 AstProgram *parseSource(void *ctx, StringCache &strcache, const char *filename, const char *source, unsigned int sourcelen, MOJOBASIC_includeOpen include_open, MOJOBASIC_includeClose include_close)
@@ -288,6 +293,9 @@ void Parser::convertToParserToken(TokenData &data)
         TOKENCMP(STEP);
         TOKENCMP(USING);
         TOKENCMP(WEND);
+        TOKENCMP(OPTION);
+        TOKENCMP(EXPLICIT);
+        TOKENCMP(BASE);
         #undef TOKENCMP
     } // if
 } // Parser::convertToParserToken
@@ -313,7 +321,10 @@ AstProgram *Parser::run(const char *filename, const char *source, unsigned int s
     preprocessor_end(pp);
     pp = NULL;
 
-    return new AstProgram(startpos, collector.newStatementBlock());
+    if (optionExplicit == -1) optionExplicit = 0;
+    if (optionBase == -1) optionBase = 1;
+
+    return new AstProgram(startpos, collector.newStatementBlock(), optionExplicit != 0, optionBase);
 } // Parser::run
 
 void Parser::pushback()
@@ -433,6 +444,9 @@ AstStatement *Parser::parseStatement() {
 
     while (want(TOKEN_NEWLINE)) { /* spin */ } // skip blank lines.
 
+    // OPTION doesn't return a statement, so just eat these without returning.
+    while (want(TOKEN_OPTION)) { parseOption(); needEndOfStatement(); }
+
     if (want(TOKEN_EOI)) return NULL;   // we're done.
     else if (want(TOKEN_METACOMMAND)) return parseMetacommand();
     else if (want(TOKEN_DECLARE)) return parseDeclare();
@@ -804,6 +818,33 @@ AstStatement *Parser::parseOn() {
     return failAndDumpStatement("Syntax error");  // !!! FIXME: "expected ERROR,etc"?
 } // Parser::parseOn
 
+void Parser::parseOption() {
+    const char *dupeerr = "Duplicate OPTION statement";
+
+    if (want(TOKEN_EXPLICIT)) {
+        if (optionExplicit != -1) {
+            fail(dupeerr);
+        } else {
+            optionExplicit = 1;
+        }
+    } else if (want(TOKEN_BASE)) {
+        const char *oneOrZeroErr = "Expected 0 or 1";
+        if (need(TOKEN_INT_LITERAL, oneOrZeroErr)) {
+            if ((previousToken.i64 != 0) && (previousToken.i64 != 1)) {
+                fail(oneOrZeroErr);
+            } else {
+                if (optionBase != -1) {
+                    fail(dupeerr);
+                } else {
+                    optionBase = (int) previousToken.i64;
+                }
+            }
+        }
+    } else {
+        fail("Expected BASE or EXPLICIT");
+    }
+} // Parser::parseOption
+
 AstForStatement *Parser::parseFor()
 {
     const SourcePosition position(previousToken.position);

diff --git a/mojobasic_preprocessor.cpp b/mojobasic_preprocessor.cpp
@@ -237,6 +237,9 @@ static void MOJOBASIC_print_debug_token(const char *subsystem, const char *token
         TOKENCASE(TOKEN_STEP);
         TOKENCASE(TOKEN_USING);
         TOKENCASE(TOKEN_WEND);
+        TOKENCASE(TOKEN_OPTION);
+        TOKENCASE(TOKEN_EXPLICIT);
+        TOKENCASE(TOKEN_BASE);
         #undef TOKENCASE
 
         default: