Merge branch 'master' into refactor

Makefile

@@ -1,5 +1,5 @@
 SOURCES = $(shell find . -name '*.go')
-PARSERS = $(shell find . -name '*.parser')
+PARSERS = $(shell find . -name '*.treerack')
 
 default: build
 

README.md

@@ -4,6 +4,6 @@
 
 ### Examples
 
-- JSON: https://github.com/aryszka/treerack/blob/master/json.parser
-- Scheme: https://github.com/aryszka/treerack/blob/master/scheme.parser
-- Treerack (itself): https://github.com/aryszka/treerack/blob/master/syntax.parser
+- JSON: https://github.com/aryszka/treerack/blob/master/json.treerack
+- Scheme: https://github.com/aryszka/treerack/blob/master/scheme.treerack
+- Treerack (itself): https://github.com/aryszka/treerack/blob/master/treerack.treerack

boot.go

@@ -211,7 +211,7 @@ func bootSyntax() (*Syntax, error) {
 		return nil, err
 	}
 
-	f, err := os.Open("syntax.parser")
+	f, err := os.Open("treerack.treerack")
 	if err != nil {
 		return nil, err
 	}

boot_test.go

@@ -51,7 +51,7 @@ func TestBoot(t *testing.T) {
 		return
 	}
 
-	f, err := os.Open("syntax.parser")
+	f, err := os.Open("treerack.treerack")
 	if err != nil {
 		t.Error(err)
 		return

eskip_test.go

@@ -726,7 +726,7 @@ func TestEskip(t *testing.T) {
 	e := eskip.Print(true, r...)
 	b := bytes.NewBufferString(e)
 
-	s, err := openSyntaxFile("eskip.parser")
+	s, err := openSyntaxFile("eskip.treerack")
 	if err != nil {
 		t.Error(err)
 		return

json_test.go

@@ -285,7 +285,7 @@ func jsonTreeToJSON(n *Node) (interface{}, error) {
 }
 
 func TestJSON(t *testing.T) {
-	runTestsFile(t, "json.parser", []testItem{{
+	runTestsFile(t, "json.treerack", []testItem{{
 		title: "true",
 		text:  "true",
 		node: &Node{
@@ -509,7 +509,7 @@ func TestRandomJSON(t *testing.T) {
 
 	buf := bytes.NewBuffer(b)
 
-	s, err := openSyntaxFile("json.parser")
+	s, err := openSyntaxFile("json.treerack")
 	if err != nil {
 		t.Error(err)
 		return

keyval_test.go

@@ -3,7 +3,7 @@ package treerack
 import "testing"
 
 func TestKeyVal(t *testing.T) {
-	runTestsFile(t, "keyval.parser", []testItem{{
+	runTestsFile(t, "keyval.treerack", []testItem{{
 		title: "empty",
 	}, {
 		title: "a comment",

mml_test.go

@@ -9,7 +9,7 @@ import (
 )
 
 func TestMML(t *testing.T) {
-	s, err := openSyntaxFile("mml.parser")
+	s, err := openSyntaxFile("mml.treerack")
 	if err != nil {
 		t.Error(err)
 		return
@@ -2969,7 +2969,7 @@ func TestMMLFile(t *testing.T) {
 
 	const n = 180
 
-	s, err := openSyntaxFile("mml.parser")
+	s, err := openSyntaxFile("mml.treerack")
 	if err != nil {
 		t.Error(err)
 		return

scheme_test.go

@@ -3,7 +3,7 @@ package treerack
 import "testing"
 
 func TestScheme(t *testing.T) {
-	runTestsFile(t, "scheme.parser", []testItem{{
+	runTestsFile(t, "scheme.treerack", []testItem{{
 		title: "empty",
 	}, {
 		title: "a function",

sexpr_test.go

@@ -3,7 +3,7 @@ package treerack
 import "testing"
 
 func TestSExpr(t *testing.T) {
-	runTestsFile(t, "sexpr.parser", []testItem{{
+	runTestsFile(t, "sexpr.treerack", []testItem{{
 		title: "number",
 		text:  "42",
 		nodes: []*Node{{