STRING token in right section, DebugString() compact mode

ast/ast.go

@@ -24,6 +24,7 @@ type PrintState struct {
 
 func DebugString(n Node) string {
 	ps := NewPrintState()
+	ps.Compact = true
 	n.PrettyPrint(ps)
 	return ps.String()
 }

eval/eval_test.go

@@ -338,7 +338,7 @@ func TestFunctionObject(t *testing.T) {
 	if ast.DebugString(fn.Parameters[0]) != "x" {
 		t.Fatalf("parameter is not 'x'. got=%q", fn.Parameters[0])
 	}
-	expectedBody := "x + 2\n"
+	expectedBody := "x+2"
 	got := ast.DebugString(fn.Body)
 	if got != expectedBody {
 		t.Fatalf("body is not %q. got=%q", expectedBody, got)
@@ -615,15 +615,15 @@ func TestQuote(t *testing.T) {
 		},
 		{
 			`quote(5 + 8)`,
-			`5 + 8`,
+			`5+8`,
 		},
 		{
 			`quote(foobar)`,
 			`foobar`,
 		},
 		{
 			`quote(foobar + barfoo)`,
-			`foobar + barfoo`,
+			`foobar+barfoo`,
 		},
 	}
 
@@ -661,11 +661,11 @@ func TestQuoteUnquote(t *testing.T) {
 		},
 		{
 			`quote(8 + unquote(4 + 4))`,
-			`8 + 8`,
+			`8+8`,
 		},
 		{
 			`quote(unquote(4 + 4) + 8)`,
-			`8 + 8`,
+			`8+8`,
 		},
 		{
 			`foobar = 8;
@@ -687,12 +687,12 @@ func TestQuoteUnquote(t *testing.T) {
 		},
 		{
 			`quote(unquote(quote(4 + 4)))`,
-			`4 + 4`,
+			`4+4`,
 		},
 		{
 			`quotedInfixExpression = quote(4 + 4);
             quote(unquote(4 + 4) + unquote(quotedInfixExpression))`,
-			`8 + (4 + 4)`,
+			`8+(4+4)`,
 		},
 	}
 	for _, tt := range tests {

eval/macro_expension_test.go

@@ -57,7 +57,7 @@ func TestDefineMacros(t *testing.T) {
 		t.Fatalf("parameter is not 'y'. got=%q", macro.Parameters[1])
 	}
 
-	expectedBody := "x + y\n" // or should have {}?
+	expectedBody := "x+y" // or should have {}?
 	got := ast.DebugString(macro.Body)
 	if got != expectedBody {
 		t.Fatalf("body is not %q. got=%q", expectedBody, got)

examples/fib.gr

@@ -1,3 +1,4 @@
+/* fib.gr - compute the 35th Fibonacci number */
 func fib(x) {
 	if x <= 1 {
 		x

parser/parser_book_test.go

@@ -345,7 +345,7 @@ func TestOperatorPrecedenceParsing(t *testing.T) {
 		program := p.ParseProgram()
 		checkParserErrors(t, p)
 
-		actual := ast.DebugString(program)
+		actual := program.PrettyPrint(ast.NewPrintState()).String()
 		last := actual[len(actual)-1]
 		if actual[len(actual)-1] != '\n' {
 			t.Errorf("expecting newline at end of program output, not found, got %q", last)
@@ -604,7 +604,7 @@ func TestCallExpressionParameterParsing(t *testing.T) {
 		{
 			input:         "add(1, 2 * 3, 4 + 5);",
 			expectedIdent: "add",
-			expectedArgs:  []string{"1", "2 * 3", "4 + 5"},
+			expectedArgs:  []string{"1", "2*3", "4+5"},
 		},
 	}
 

parser/parser_test.go

@@ -197,7 +197,7 @@ func Test_OperatorPrecedenceParsing(t *testing.T) {
 		program := p.ParseProgram()
 		checkParserErrors(t, tt.input, p)
 
-		actual := ast.DebugString(program)
+		actual := program.PrettyPrint(ast.NewPrintState()).String()
 		last := actual[len(actual)-1]
 		if actual[len(actual)-1] != '\n' {
 			t.Errorf("expecting newline at end of program output, not found, got %q", last)

token/token.go

@@ -1,7 +1,7 @@
 // There are 2 types of Token, constant ones (with no "value") and the ones with attached
-// value that is variable (e.g. IDENT, INT, FLOAT, STRING, COMMENT).
-// We'd use the upcoming unique https://tip.golang.org/doc/go1.23#new-unique-package
-// but we want this to run on 1.22 and earlier.
+// value that is variable (e.g. IDENT, INT, FLOAT, STRING, *COMMENT).
+// We might have used the upcoming unique https://tip.golang.org/doc/go1.23#new-unique-package
+// but we want this to run on 1.22 and earlier and rolled our own, not multi threaded.
 package token
 
 import (
@@ -56,9 +56,10 @@ const (
 	startValueTokens
 
 	// Identifiers + literals. with attached value.
-	IDENT // add, foobar, x, y, ...
-	INT   // 1343456
-	FLOAT // 1. 1e3
+	IDENT  // add, foobar, x, y, ...
+	INT    // 1343456
+	FLOAT  // .5, 3.14159,...
+	STRING // "foo bar"
 	LINECOMMENT
 	BLOCKCOMMENT
 
@@ -112,7 +113,6 @@ const (
 	IF
 	ELSE
 	RETURN
-	STRING
 	MACRO
 	// Macro magic.
 	QUOTE