Merge pull request google#7 from jbeda/parser

Finish up blocking out the parser.

Author: jbeda

README.md

@@ -12,3 +12,13 @@
 This is a port of [jsonnet](http://jsonnet.org/) to go.  It is very much a work in progress.
 
 This implementation is largely based on the the [jsonnet C++ implementation](https://github.com/google/jsonnet).
+
+## Implementation Notes
+
+We are generating some helper classes on types by using http://clipperhouse.github.io/gen/.  Do the following to regenerate these if necessary:
+
+```
+go get github.com/clipperhouse/gen
+go get github.com/clipperhouse/set
+go generate
+```

_gen.go

@@ -0,0 +1,7 @@
+package main
+
+import (
+	_ "github.com/clipperhouse/set"
+	_ "github.com/clipperhouse/slice"
+	_ "github.com/clipperhouse/stringer"
+)

ast.go

@@ -53,6 +53,8 @@ import (
 // )
 
 // identifier represents a variable / parameter / field name.
+
+//+gen set
 type identifier string
 type identifiers []identifier
 
@@ -78,17 +80,18 @@ func (n *astNodeBase) Loc() *LocationRange {
 
 // ---------------------------------------------------------------------------
 
+// +gen stringer
 type astCompKind int
 
 const (
-	astCompFor = iota
+	astCompFor astCompKind = iota
 	astCompIf
 )
 
 type astCompSpec struct {
 	kind    astCompKind
-	varName identifier // nil when kind != compSpecFor
-	expr    *astNode
+	varName *identifier // nil when kind != compSpecFor
+	expr    astNode
 }
 type astCompSpecs []astCompSpec
 
@@ -203,9 +206,36 @@ var bopStrings = []string{
 	bopOr:  "||",
 }
 
+var bopMap = map[string]binaryOp{
+	"*": bopMult,
+	"/": bopDiv,
+	"%": bopPercent,
+
+	"+": bopPlus,
+	"-": bopMinus,
+
+	"<<": bopShiftL,
+	">>": bopShiftR,
+
+	">":  bopGreater,
+	">=": bopGreaterEq,
+	"<":  bopLess,
+	"<=": bopLessEq,
+
+	"==": bopManifestEqual,
+	"!=": bopManifestUnequal,
+
+	"&": bopBitwiseAnd,
+	"^": bopBitwiseXor,
+	"|": bopBitwiseOr,
+
+	"&&": bopAnd,
+	"||": bopOr,
+}
+
 func (b binaryOp) String() string {
 	if b < 0 || int(b) >= len(bopStrings) {
-		panic(fmt.Sprintf("INTERNAL ERROR: Unrecognised binary operator: %v", b))
+		panic(fmt.Sprintf("INTERNAL ERROR: Unrecognised binary operator: %d", b))
 	}
 	return bopStrings[b]
 }
@@ -299,11 +329,11 @@ type astIndex struct {
 
 // astLocalBind is a helper struct for astLocal
 type astLocalBind struct {
-	variable       identifier
-	body           astNode
-	functionSugar  bool
-	params         identifiers // if functionSugar is true
-	trailingComman bool
+	variable      identifier
+	body          astNode
+	functionSugar bool
+	params        identifiers // if functionSugar is true
+	trailingComma bool
 }
 type astLocalBinds []astLocalBind
 
@@ -332,11 +362,13 @@ type astLiteralNull struct{ astNodeBase }
 // astLiteralNumber represents a JSON number
 type astLiteralNumber struct {
 	astNodeBase
-	value float64
+	value          float64
+	originalString string
 }
 
 // ---------------------------------------------------------------------------
 
+// +gen stringer
 type astLiteralStringKind int
 
 const (
@@ -355,6 +387,7 @@ type astLiteralString struct {
 
 // ---------------------------------------------------------------------------
 
+// +gen stringer
 type astObjectFieldKind int
 
 const (
@@ -365,6 +398,7 @@ const (
 	astObjectLocal                               // local id = expr2
 )
 
+// +gen stringer
 type astObjectFieldHide int
 
 const (
@@ -379,7 +413,7 @@ type astObjectField struct {
 	superSugar    bool               // +:  (ignore if kind != astObjectField*)
 	methodSugar   bool               // f(x, y, z): ...  (ignore if kind  == astObjectAssert)
 	expr1         astNode            // Not in scope of the object
-	id            identifier
+	id            *identifier
 	ids           identifiers // If methodSugar == true then holds the params.
 	trailingComma bool        // If methodSugar == true then remembers the trailing comma
 	expr2, expr3  astNode     // In scope of the object (can see self).
@@ -453,6 +487,7 @@ type astSelf struct{ astNodeBase }
 // Either index or identifier will be set before desugaring.  After desugaring, id will be
 // nil.
 type astSuperIndex struct {
+	astNodeBase
 	index astNode
 	id    *identifier
 }
@@ -475,9 +510,16 @@ var uopStrings = []string{
 	uopMinus:      "-",
 }
 
+var uopMap = map[string]unaryOp{
+	"!": uopNot,
+	"~": uopBitwiseNot,
+	"+": uopPlus,
+	"-": uopMinus,
+}
+
 func (u unaryOp) String() string {
 	if u < 0 || int(u) >= len(uopStrings) {
-		panic(fmt.Sprintf("INTERNAL ERROR: Unrecognised unary operator: %v", u))
+		panic(fmt.Sprintf("INTERNAL ERROR: Unrecognised unary operator: %d", u))
 	}
 	return uopStrings[u]
 }

astcompkind_stringer.go

@@ -0,0 +1,20 @@
+// Generated by: main
+// TypeWriter: stringer
+// Directive: +gen on astCompKind
+
+package jsonnet
+
+import (
+	"fmt"
+)
+
+const _astCompKind_name = "astCompForastCompIf"
+
+var _astCompKind_index = [...]uint8{0, 10, 19}
+
+func (i astCompKind) String() string {
+	if i < 0 || i+1 >= astCompKind(len(_astCompKind_index)) {
+		return fmt.Sprintf("astCompKind(%d)", i)
+	}
+	return _astCompKind_name[_astCompKind_index[i]:_astCompKind_index[i+1]]
+}

astliteralstringkind_stringer.go

@@ -0,0 +1,20 @@
+// Generated by: main
+// TypeWriter: stringer
+// Directive: +gen on astLiteralStringKind
+
+package jsonnet
+
+import (
+	"fmt"
+)
+
+const _astLiteralStringKind_name = "astStringSingleastStringDoubleastStringBlock"
+
+var _astLiteralStringKind_index = [...]uint8{0, 15, 30, 44}
+
+func (i astLiteralStringKind) String() string {
+	if i < 0 || i+1 >= astLiteralStringKind(len(_astLiteralStringKind_index)) {
+		return fmt.Sprintf("astLiteralStringKind(%d)", i)
+	}
+	return _astLiteralStringKind_name[_astLiteralStringKind_index[i]:_astLiteralStringKind_index[i+1]]
+}

astobjectfieldhide_stringer.go

@@ -0,0 +1,20 @@
+// Generated by: main
+// TypeWriter: stringer
+// Directive: +gen on astObjectFieldHide
+
+package jsonnet
+
+import (
+	"fmt"
+)
+
+const _astObjectFieldHide_name = "astObjectFieldHiddenastObjectFieldInheritastObjectFieldVisible"
+
+var _astObjectFieldHide_index = [...]uint8{0, 20, 41, 62}
+
+func (i astObjectFieldHide) String() string {
+	if i < 0 || i+1 >= astObjectFieldHide(len(_astObjectFieldHide_index)) {
+		return fmt.Sprintf("astObjectFieldHide(%d)", i)
+	}
+	return _astObjectFieldHide_name[_astObjectFieldHide_index[i]:_astObjectFieldHide_index[i+1]]
+}

astobjectfieldkind_stringer.go

@@ -0,0 +1,20 @@
+// Generated by: main
+// TypeWriter: stringer
+// Directive: +gen on astObjectFieldKind
+
+package jsonnet
+
+import (
+	"fmt"
+)
+
+const _astObjectFieldKind_name = "astObjectAssertastObjectFieldIDastObjectFieldExprastObjectFieldStrastObjectLocal"
+
+var _astObjectFieldKind_index = [...]uint8{0, 15, 31, 49, 66, 80}
+
+func (i astObjectFieldKind) String() string {
+	if i < 0 || i+1 >= astObjectFieldKind(len(_astObjectFieldKind_index)) {
+		return fmt.Sprintf("astObjectFieldKind(%d)", i)
+	}
+	return _astObjectFieldKind_name[_astObjectFieldKind_index[i]:_astObjectFieldKind_index[i+1]]
+}

doc.go

@@ -25,3 +25,5 @@ text.
 See http://jsonnet.org/ for a full language description and tutorial.
 */
 package jsonnet
+
+//go:generate gen