More parser fixes

mmoskal · mmoskal · commit e07352f0ca69 · 2019-02-13T11:42:10.000-08:00
diff --git a/pxtpy/lexer.ts b/pxtpy/lexer.ts
@@ -137,7 +137,9 @@ namespace pxt.py {
         } else {
             s = "`" + source.slice(t.startPos, t.endPos) + "`"
         }
-        s = s.replace(/\r/g, "").replace(/\n/g, "\\n")
+        s = s.replace(/\r/g, "")
+            .replace(/\n/g, "\\n")
+            .replace(/\t/g, "\\t")
         let r = U.lf("{0} at {1}{2}", s, fn, position(t, source))
         if (pxt.options.debug)
             r += " " + tokenToString(t)
@@ -190,6 +192,7 @@ namespace pxt.py {
             }
         }
         pos0 = pos
+        singleNewline()
         addToken(TokenType.EOF, "")
         return res
 
@@ -354,8 +357,10 @@ namespace pxt.py {
             while (true) {
                 const ch = source.charCodeAt(pos)
                 if (ch == 9) {
-                    addError(U.lf("TAB indentaion not supported"))
-                    break
+                    // addError(U.lf("TAB indentaion not supported"))
+                    ind = (ind + 8) & ~7
+                    pos++
+                    continue
                 }
                 if (ch != 32)
                     break
diff --git a/pxtpy/parser.ts b/pxtpy/parser.ts
@@ -293,10 +293,12 @@ namespace pxt.py {
     function raise_stmt(): Stmt {
         let r = mkAST("Raise") as Raise
         expectKw("raise")
-        r.exc = test()
-        if (currentKw() == "from") {
-            shiftToken()
-            r.cause = test()
+        if (!atStmtEnd()) {
+            r.exc = test()
+            if (currentKw() == "from") {
+                shiftToken()
+                r.cause = test()
+            }
         }
         return finish(r)
     }
@@ -349,6 +351,7 @@ namespace pxt.py {
 
     function del_stmt(): Stmt {
         let r = mkAST("Delete") as Delete
+        expectKw("del")
         r.targets = parseList(U.lf("expression"), expr)
         return finish(r)
     }
@@ -963,6 +966,7 @@ namespace pxt.py {
             return dict(null, expr())
         } else if (currentOp() == "RBracket") {
             let r = mkAST("Dict", t0) as Dict
+            shiftToken()
             r.keys = []
             r.values = []
             return finish(r)
@@ -1193,6 +1197,7 @@ namespace pxt.py {
             let r = mkAST(comp) as GeneratorExp
             r.elt = e0
             r.generators = comp_for()
+            expectOp(cl)
             return finish(r)
         }
 
diff --git a/tests/python/parse0.py b/tests/python/parse0.py
@@ -1 +1,3 @@
+headers = {}
+del pulses[0]
 q = [int(i * self.brightness) for i in self._buf]

Original file line number	Diff line number	Diff line change
`@@ -1 +1,3 @@`
	`1`	`+headers = {}`
	`2`	`+del pulses[0]`
`1`	`3`	`q = [int(i * self.brightness) for i in self._buf]`