Fixed issue with multiple assignments

Author: Tobias-Kohn

tpParser/shared/src/main/scala/tigerpython/parser/parsing/ArgumentParser.scala

@@ -212,6 +212,24 @@ class ArgumentParser(val parser: Parser, val parserState: ParserState) {
         tokens.next()
         matchComa(tokens)
         SlashParameter(pos) :: parseParameters(tokens, allowTypes)
+      case TokenType.ASSIGN =>
+        val pos = tokens.pos
+        tokens.next()
+        if (tokens.hasType(TokenType.RIGHT_PARENS, TokenType.COMMA)) {
+          parserState.reportError(pos, ErrorCode.EXTRA_TOKEN, "=")
+          if (matchComa(tokens))
+            SimpleParameter(pos, "", null) :: parseParameters(tokens, allowTypes)
+          else
+            SimpleParameter(pos, "", null) :: Nil
+        } else {
+          parserState.reportError(pos, ErrorCode.NAME_EXPECTED)
+          val defStart = tokens.pos
+          val defExpr = expressionParser.parseTest(tokens)
+          val defEnd = tokens.pos
+          val result = DefaultParameter(pos, "", defExpr, tokens.textSource.subSequence(defStart, defEnd).toString.trim, null)
+          matchComa(tokens)
+          result :: parseParameters(tokens, allowTypes)
+        }
       case _ =>
         val name = parseKeywordName(tokens)
         if (name == null) {
@@ -226,6 +244,14 @@ class ArgumentParser(val parser: Parser, val parserState: ParserState) {
             val defStart = tokens.pos
             val defExpr = expressionParser.parseTest(tokens)
             val defEnd = tokens.pos
+            if (tokens.matchType(TokenType.ASSIGN)) {
+              if (tokens.hasType(TokenType.COMMA, TokenType.RIGHT_PARENS))
+                parserState.reportError(tokens.prevPos, ErrorCode.EXTRA_TOKEN, "=")
+              else {
+                parserState.reportError(tokens.prevPos, ErrorCode.MISPLACED_ASSIGN, "=")
+                expressionParser.parseTest(tokens)
+              }
+            }
             DefaultParameter(name.pos, name.name, defExpr, tokens.textSource.subSequence(defStart, defEnd).toString.trim, annot)
           }
           else

tpParser/shared/src/main/scala/tigerpython/parser/parsing/ExpressionParser.scala

@@ -471,7 +471,7 @@ class ExpressionParser(val parser: Parser, val parserState: ParserState) {
 
   protected def parseArithExpr(tokens: TokenBuffer): Expression = {
     var result = parseTerm(tokens)
-    while (tokens.hasType(TokenType.PLUS, TokenType.MINUS)) {
+    while (tokens.hasType(TokenType.PLUS, TokenType.MINUS) && result != null) {
       val op = BinOp.fromTokenType(tokens.next().tokenType)
       result = AstNode.BinaryOp(result.pos, op, result, parseTerm(tokens))
     }
@@ -481,7 +481,7 @@ class ExpressionParser(val parser: Parser, val parserState: ParserState) {
   protected def parseTerm(tokens: TokenBuffer): Expression = {
     var result = parseFactor(tokens)
     while (tokens.hasType(TokenType.STAR, TokenType.DIV, TokenType.INT_DIV, TokenType.MOD,
-                  TokenType.ANNOTATION)) {
+                  TokenType.ANNOTATION) && result != null) {
       val op = BinOp.fromTokenType(tokens.next().tokenType)
       result = AstNode.BinaryOp(result.pos, op, result, parseFactor(tokens))
     }

tpParser/shared/src/test/programs/erroneous/parameters_01.txt

@@ -0,0 +1,6 @@
+# 1
+# MISPLACED_ASSIGN
+def garage(screws=+nails=+washers):
+    print("Final price is: " screws=+nails=+washers)
+
+screws = 123

tpParser/shared/src/test/scala/DebugTester.scala

@@ -14,19 +14,33 @@ class DebugTester extends FunSuite  {
   }
 
   private val PROGRAM: String =
-    """import turtle
-      |turtle.""".stripMargin
+    """def foo(x=+y=+z):
+      |    print(x)
+      |
+      |x = 123""".stripMargin
 
   {
-    val pyiSource = loadFromFile("./tpParser/shared/src/test/programs/completer/typeshed/turtle.pyi")
+/*    val pyiSource = loadFromFile("./tpParser/shared/src/test/programs/completer/typeshed/turtle.pyi")
     ModuleLoader.addPyiModule("turtle", pyiSource)
     val completer = new Completer("<module>", PROGRAM, PROGRAM.length)
-    val nameFilter = completer.getNameFilter
+    val nameFilter = completer.getNameFilter*/
     /*if (nameFilter != null) {
       val suggestions = nameFilter.getNameList("")
       println(suggestions.mkString(";"))
       println("– done –")
     } else
       println("– no entries –")*/
+    /*val p = new Parser(PROGRAM)
+    p.repeatStatement = true
+    val cs = p.checkSyntax()
+    if (cs.nonEmpty) {
+      val pos = cs.get.position
+      println("ERROR")
+      println(PROGRAM.slice(0, pos))
+      println("???")
+      println(PROGRAM.slice(pos, PROGRAM.length))
+    }
+    assert(cs.isEmpty)
+    print("DONE")*/
   }
 }