minispec: CommandStmt

cmd/chore/gopminispec/minispec.gop

@@ -16,6 +16,7 @@
 
 import (
     "gop/doc/spec/mini"
+    "gop/tpl"
     "os"
 )
 
@@ -24,4 +25,9 @@ if len(os.Args) < 2 {
 	return
 }
 
-echo mini.parseFile(nil, os.Args[1], nil)
+f, err := mini.parseFile(nil, os.Args[1], nil)
+if err != nil {
+    fprintln os.Stderr, err
+} else {
+    tpl.dump f
+}

doc/spec/mini/mini.gop

@@ -74,8 +74,9 @@ Block = "{" StatementList "}"
 StatementList = *(Statement ";")
 
 Statement =
-	Declaration | ReturnStmt | BreakStmt | ContinueStmt | GotoStmt | FallthroughStmt |
-	IfStmt | SwitchStmt | ForStmt | DeferStmt | Block | LabeledStmt | SimpleStmt
+	Declaration | ReturnStmt | BreakStmt | ContinueStmt | GotoStmt |
+	FallthroughStmt | IfStmt | SwitchStmt | ForStmt | DeferStmt | Block |
+	LabeledStmt | CommandStmt | SimpleStmt
 
 ReturnStmt = "return" ?ExpressionList
 
@@ -113,6 +114,8 @@ Assignment = ExpressionList (
 
 ExpressionStmt = Expression
 
+CommandStmt = IDENT ?("." IDENT) ExpressionList
+
 EmptyStmt = ""
 
 // -----------------------------------------------------------------

tpl/tpl.go

@@ -347,8 +347,10 @@ retry:
 			}
 			fmt.Print(prefix, "]\n")
 		}
+	case nil:
+		fmt.Fprint(w, prefix, "nil\n")
 	default:
-		panic("unexpected node")
+		panic("unexpected node: " + reflect.TypeOf(ret).String())
 	}
 }