Fix #56

2013-10-28 11:54:17 -07:00 · 2013-10-28 11:54:17 -07:00 · 0c843275ba
parent c3c25bfcac
commit 0c843275ba
1 changed files with 3 additions and 1 deletions
--- a/stdx/d/parser.d
+++ b/stdx/d/parser.d
@ -3430,6 +3430,8 @@ invariant() foo();
    Module parseModule()
    {
        Module m = new Module;
+        if (currentIs(TokenType.scriptLine))
+            advance();
        if (currentIs(TokenType.module_))
            m.moduleDeclaration = parseModuleDeclaration();
        while (moreTokens())
@ -6366,7 +6368,7 @@ protected:
            else
                ++i;
        }
-        return depth == 0 ? &tokens[i] : null;
+        return i >= tokens.length ? null : depth == 0 ? &tokens[i] : null;
    }

    const(Token)* peekPastParens() const nothrow