ast.CallExpr: NoParen => NoParenEnd

ast/ast.go

@@ -319,12 +319,12 @@ type (
 
 	// A CallExpr node represents an expression followed by an argument list.
 	CallExpr struct {
-		Fun      Expr      // function expression
-		Lparen   token.Pos // position of "("
-		Args     []Expr    // function arguments; or nil
-		Ellipsis token.Pos // position of "..." (token.NoPos if there is no "...")
-		Rparen   token.Pos // position of ")"
-		NoParen  bool
+		Fun        Expr      // function expression
+		Lparen     token.Pos // position of "("
+		Args       []Expr    // function arguments; or nil
+		Ellipsis   token.Pos // position of "..." (token.NoPos if there is no "...")
+		Rparen     token.Pos // position of ")"
+		NoParenEnd token.Pos
 	}
 
 	// A StarExpr node represents an expression of the form "*" Expression.
@@ -537,7 +537,12 @@ func (x *SliceExpr) End() token.Pos { return x.Rbrack + 1 }
 func (x *TypeAssertExpr) End() token.Pos { return x.Rparen + 1 }
 
 // End returns position of first character immediately after the node.
-func (x *CallExpr) End() token.Pos { return x.Rparen + 1 }
+func (x *CallExpr) End() token.Pos {
+	if x.NoParenEnd != token.NoPos {
+		return x.NoParenEnd
+	}
+	return x.Rparen + 1
+}
 
 // End returns position of first character immediately after the node.
 func (x *StarExpr) End() token.Pos { return x.X.End() }

cl/class_file.go

@@ -39,7 +39,7 @@ type gmxInfo struct {
 
 var (
 	gmxTypes = map[string]gmxInfo{
-		".gmx": {".spx", []string{"github.com/goplus/spx"}},
+		".gmx": {".spx", []string{"github.com/goplus/spx", "math"}},
 	}
 )
 

cl/compile.go

@@ -183,6 +183,9 @@ func (p *nodeInterp) LoadExpr(node ast.Node) (src string, pos token.Position) {
 	f := p.files[pos.Filename]
 	n := int(node.End() - start)
 	pos.Filename = relFile(p.workingDir, pos.Filename)
+	if pos.Offset+n < 0 {
+		log.Println("LoadExpr:", node, pos.Filename, pos.Line, pos.Offset, node.Pos(), node.End(), n)
+	}
 	src = string(f.Code[pos.Offset : pos.Offset+n])
 	return
 }

parser/_testdata/cmdlinestyle/cmd.gop

@@ -6,5 +6,5 @@ func main() {
 	changeYpos - 0.7
 	changeYpos-0.7
 	x[1]
-	x []
+	x []...
 }

parser/parser.go

@@ -467,7 +467,12 @@ func (p *parser) atComma(context string, follow token.Token) bool {
 		if p.tok == token.SEMICOLON && p.lit == "\n" {
 			msg += " before newline"
 		}
-		p.error(p.pos, msg+" in "+context)
+		msgctx := msg + " in " + context
+		p.error(p.pos, msgctx)
+		if debugParseError {
+			log.Std.Output("", log.Linfo, 2, msgctx)
+			panic(msgctx)
+		}
 		return true // "insert" comma and continue
 	}
 	return false
@@ -1553,18 +1558,27 @@ func (p *parser) parseCallOrConversion(fun ast.Expr, isCmd bool) *ast.CallExpr {
 		if p.tok == token.ELLIPSIS {
 			ellipsis = p.pos
 			p.next()
+			if p.tok != token.RPAREN {
+				break
+			}
 		}
 		if !p.atComma("argument list", endTok) {
 			break
 		}
 		p.next()
 	}
 	p.exprLev--
-	if !isCmd {
+	var noParenEnd token.Pos
+	if isCmd {
+		noParenEnd = p.pos
+	} else {
 		rparen = p.expectClosing(token.RPAREN, "argument list")
 	}
+	if debugParseOutput {
+		log.Printf("ast.CallExpr{Fun: %v, Ellipsis: %v, isCmd: %v}\n", fun, ellipsis != 0, isCmd)
+	}
 	return &ast.CallExpr{
-		Fun: fun, Lparen: lparen, Args: list, Ellipsis: ellipsis, Rparen: rparen, NoParen: isCmd}
+		Fun: fun, Lparen: lparen, Args: list, Ellipsis: ellipsis, Rparen: rparen, NoParenEnd: noParenEnd}
 }
 
 func (p *parser) parseValue(keyOk bool) ast.Expr {

printer/nodes.go

@@ -920,8 +920,9 @@ func (p *printer) expr1(expr ast.Expr, prec1, depth int) {
 		} else {
 			wasIndented = p.possibleSelectorExpr(x.Fun, token.HighestPrec, depth)
 		}
-		if x.NoParen {
+		if x.NoParenEnd != token.NoPos {
 			p.print(blank)
+			depth++
 		} else {
 			p.print(x.Lparen, token.LPAREN)
 		}
@@ -934,7 +935,7 @@ func (p *printer) expr1(expr ast.Expr, prec1, depth int) {
 		} else {
 			p.exprList(x.Lparen, x.Args, depth, commaTerm, x.Rparen, false)
 		}
-		if !x.NoParen {
+		if x.NoParenEnd == token.NoPos {
 			p.print(x.Rparen, token.RPAREN)
 		}
 		if wasIndented {