WIP moving lang packages

fd · Feb 11, 2013 · 87e4c94 · 87e4c94
1 parent a27ded7
commit 87e4c94
Show file tree

Hide file tree

Showing 295 changed files with 76 additions and 78 deletions.
diff --git a/Makefile b/Makefile
@@ -1,12 +1,10 @@
-SX='./ast/...' './build/...' './cmd/...' './compiler/...' \
-	 './doc/...' './format/...' './parser/...'  './printer/...' \
-	 './scanner/...' './token/...' './types/...' \
+SX='./lang/...' \
 	 './cas/...' './runtime/...' './net/...'
 
 all: commands
 
 commands:
-	go get './cmd/...'
+	go get './lang/cmd/...'
 
 build_sx:
 	go get ${SX}

diff --git a/ast/ast.go → lang/ast/ast.go b/ast/ast.go → lang/ast/ast.go
@@ -8,7 +8,7 @@
 package ast
 
 import (
-	"github.com/fd/simplex/token"
+	"github.com/fd/simplex/lang/token"
 	"strings"
 	"unicode"
 	"unicode/utf8"

diff --git a/ast/ast_sx.go → lang/ast/ast_sx.go b/ast/ast_sx.go → lang/ast/ast_sx.go
@@ -1,7 +1,7 @@
 package ast
 
 import (
-	"github.com/fd/simplex/token"
+	"github.com/fd/simplex/lang/token"
 )
 
 type (

diff --git a/ast/ast_test.go → lang/ast/ast_test.go b/ast/ast_test.go → lang/ast/ast_test.go
diff --git a/ast/commentmap.go → lang/ast/commentmap.go b/ast/commentmap.go → lang/ast/commentmap.go
@@ -7,7 +7,7 @@ package ast
 import (
 	"bytes"
 	"fmt"
-	"github.com/fd/simplex/token"
+	"github.com/fd/simplex/lang/token"
 	"sort"
 )
 

diff --git a/ast/commentmap_test.go → lang/ast/commentmap_test.go b/ast/commentmap_test.go → lang/ast/commentmap_test.go
@@ -9,9 +9,9 @@ package ast_test
 import (
 	"bytes"
 	"fmt"
-	. "github.com/fd/simplex/ast"
-	"github.com/fd/simplex/parser"
-	"github.com/fd/simplex/token"
+	. "github.com/fd/simplex/lang/ast"
+	"github.com/fd/simplex/lang/parser"
+	"github.com/fd/simplex/lang/token"
 	"sort"
 	"testing"
 )

diff --git a/ast/example_test.go → lang/ast/example_test.go b/ast/example_test.go → lang/ast/example_test.go
@@ -6,9 +6,9 @@ package ast_test
 
 import (
 	"fmt"
-	"github.com/fd/simplex/ast"
-	"github.com/fd/simplex/parser"
-	"github.com/fd/simplex/token"
+	"github.com/fd/simplex/lang/ast"
+	"github.com/fd/simplex/lang/parser"
+	"github.com/fd/simplex/lang/token"
 )
 
 // This example demonstrates how to inspect the AST of a Go program.

diff --git a/ast/filter.go → lang/ast/filter.go b/ast/filter.go → lang/ast/filter.go
@@ -5,7 +5,7 @@
 package ast
 
 import (
-	"github.com/fd/simplex/token"
+	"github.com/fd/simplex/lang/token"
 	"sort"
 )
 

diff --git a/ast/filter_sx.go → lang/ast/filter_sx.go b/ast/filter_sx.go → lang/ast/filter_sx.go
diff --git a/ast/import.go → lang/ast/import.go b/ast/import.go → lang/ast/import.go
@@ -5,7 +5,7 @@
 package ast
 
 import (
-	"github.com/fd/simplex/token"
+	"github.com/fd/simplex/lang/token"
 	"sort"
 	"strconv"
 )

diff --git a/ast/print.go → lang/ast/print.go b/ast/print.go → lang/ast/print.go
@@ -8,7 +8,7 @@ package ast
 
 import (
 	"fmt"
-	"github.com/fd/simplex/token"
+	"github.com/fd/simplex/lang/token"
 	"io"
 	"os"
 	"reflect"

diff --git a/ast/print_test.go → lang/ast/print_test.go b/ast/print_test.go → lang/ast/print_test.go
diff --git a/ast/replace.go → lang/ast/replace.go b/ast/replace.go → lang/ast/replace.go
diff --git a/ast/resolve.go → lang/ast/resolve.go b/ast/resolve.go → lang/ast/resolve.go
@@ -8,8 +8,8 @@ package ast
 
 import (
 	"fmt"
-	"github.com/fd/simplex/scanner"
-	"github.com/fd/simplex/token"
+	"github.com/fd/simplex/lang/scanner"
+	"github.com/fd/simplex/lang/token"
 	"strconv"
 )
 

diff --git a/ast/scope.go → lang/ast/scope.go b/ast/scope.go → lang/ast/scope.go
@@ -9,7 +9,7 @@ package ast
 import (
 	"bytes"
 	"fmt"
-	"github.com/fd/simplex/token"
+	"github.com/fd/simplex/lang/token"
 )
 
 // A Scope maintains the set of named language entities declared

diff --git a/ast/walk.go → lang/ast/walk.go b/ast/walk.go → lang/ast/walk.go
diff --git a/build/build.go → lang/build/build.go b/build/build.go → lang/build/build.go
diff --git a/build/build_test.go → lang/build/build_test.go b/build/build_test.go → lang/build/build_test.go
diff --git a/build/deps_test.go → lang/build/deps_test.go b/build/deps_test.go → lang/build/deps_test.go
diff --git a/build/doc.go → lang/build/doc.go b/build/doc.go → lang/build/doc.go
diff --git a/build/read.go → lang/build/read.go b/build/read.go → lang/build/read.go
diff --git a/build/read_test.go → lang/build/read_test.go b/build/read_test.go → lang/build/read_test.go
diff --git a/build/syslist.go → lang/build/syslist.go b/build/syslist.go → lang/build/syslist.go
diff --git a/build/syslist_test.go → lang/build/syslist_test.go b/build/syslist_test.go → lang/build/syslist_test.go
diff --git a/build/testdata/other/file/file.go → lang/build/testdata/other/file/file.go b/build/testdata/other/file/file.go → lang/build/testdata/other/file/file.go
diff --git a/build/testdata/other/main.go → lang/build/testdata/other/main.go b/build/testdata/other/main.go → lang/build/testdata/other/main.go
diff --git a/cmd/sx/bootstrap.go → lang/cmd/sx/bootstrap.go b/cmd/sx/bootstrap.go → lang/cmd/sx/bootstrap.go
diff --git a/cmd/sx/build.go → lang/cmd/sx/build.go b/cmd/sx/build.go → lang/cmd/sx/build.go
@@ -10,7 +10,7 @@ import (
 	"errors"
 	"flag"
 	"fmt"
-	"github.com/fd/simplex/build"
+	"github.com/fd/simplex/lang/build"
 	"io"
 	"io/ioutil"
 	"log"

diff --git a/cmd/sx/clean.go → lang/cmd/sx/clean.go b/cmd/sx/clean.go → lang/cmd/sx/clean.go
diff --git a/cmd/sx/discovery.go → lang/cmd/sx/discovery.go b/cmd/sx/discovery.go → lang/cmd/sx/discovery.go
diff --git a/cmd/sx/doc.go → lang/cmd/sx/doc.go b/cmd/sx/doc.go → lang/cmd/sx/doc.go
diff --git a/cmd/sx/env.go → lang/cmd/sx/env.go b/cmd/sx/env.go → lang/cmd/sx/env.go
diff --git a/cmd/sx/fix.go → lang/cmd/sx/fix.go b/cmd/sx/fix.go → lang/cmd/sx/fix.go
diff --git a/cmd/sx/fmt.go → lang/cmd/sx/fmt.go b/cmd/sx/fmt.go → lang/cmd/sx/fmt.go
diff --git a/cmd/sx/get.go → lang/cmd/sx/get.go b/cmd/sx/get.go → lang/cmd/sx/get.go
@@ -8,7 +8,7 @@ package main
 
 import (
 	"fmt"
-	"github.com/fd/simplex/build"
+	"github.com/fd/simplex/lang/build"
 	"os"
 	"path/filepath"
 	"regexp"

diff --git a/cmd/sx/help.go → lang/cmd/sx/help.go b/cmd/sx/help.go → lang/cmd/sx/help.go
diff --git a/cmd/sx/http.go → lang/cmd/sx/http.go b/cmd/sx/http.go → lang/cmd/sx/http.go
diff --git a/cmd/sx/list.go → lang/cmd/sx/list.go b/cmd/sx/list.go → lang/cmd/sx/list.go
diff --git a/cmd/sx/main.go → lang/cmd/sx/main.go b/cmd/sx/main.go → lang/cmd/sx/main.go
@@ -8,7 +8,7 @@ import (
 	"bytes"
 	"flag"
 	"fmt"
-	"github.com/fd/simplex/build"
+	"github.com/fd/simplex/lang/build"
 	"io"
 	"log"
 	"os"

diff --git a/cmd/sx/match_test.go → lang/cmd/sx/match_test.go b/cmd/sx/match_test.go → lang/cmd/sx/match_test.go
diff --git a/cmd/sx/mkdoc.sh → lang/cmd/sx/mkdoc.sh b/cmd/sx/mkdoc.sh → lang/cmd/sx/mkdoc.sh
diff --git a/cmd/sx/pkg.go → lang/cmd/sx/pkg.go b/cmd/sx/pkg.go → lang/cmd/sx/pkg.go
@@ -8,9 +8,9 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	"github.com/fd/simplex/build"
-	"github.com/fd/simplex/scanner"
-	"github.com/fd/simplex/token"
+	"github.com/fd/simplex/lang/build"
+	"github.com/fd/simplex/lang/scanner"
+	"github.com/fd/simplex/lang/token"
 	"os"
 	pathpkg "path"
 	"path/filepath"

diff --git a/cmd/sx/run.go → lang/cmd/sx/run.go b/cmd/sx/run.go → lang/cmd/sx/run.go
diff --git a/cmd/sx/script → lang/cmd/sx/script b/cmd/sx/script → lang/cmd/sx/script
diff --git a/cmd/sx/script.txt → lang/cmd/sx/script.txt b/cmd/sx/script.txt → lang/cmd/sx/script.txt
diff --git a/cmd/sx/signal.go → lang/cmd/sx/signal.go b/cmd/sx/signal.go → lang/cmd/sx/signal.go
diff --git a/cmd/sx/signal_notunix.go → lang/cmd/sx/signal_notunix.go b/cmd/sx/signal_notunix.go → lang/cmd/sx/signal_notunix.go
diff --git a/cmd/sx/signal_unix.go → lang/cmd/sx/signal_unix.go b/cmd/sx/signal_unix.go → lang/cmd/sx/signal_unix.go
diff --git a/cmd/sx/tag_test.go → lang/cmd/sx/tag_test.go b/cmd/sx/tag_test.go → lang/cmd/sx/tag_test.go
diff --git a/cmd/sx/test.bash → lang/cmd/sx/test.bash b/cmd/sx/test.bash → lang/cmd/sx/test.bash
diff --git a/cmd/sx/test.go → lang/cmd/sx/test.go b/cmd/sx/test.go → lang/cmd/sx/test.go
@@ -7,11 +7,11 @@ package main
 import (
 	"bytes"
 	"fmt"
-	"github.com/fd/simplex/ast"
-	"github.com/fd/simplex/build"
-	"github.com/fd/simplex/doc"
-	"github.com/fd/simplex/parser"
-	"github.com/fd/simplex/token"
+	"github.com/fd/simplex/lang/ast"
+	"github.com/fd/simplex/lang/build"
+	"github.com/fd/simplex/lang/doc"
+	"github.com/fd/simplex/lang/parser"
+	"github.com/fd/simplex/lang/token"
 	"os"
 	"os/exec"
 	"path"

diff --git a/cmd/sx/testdata/errmsg/x.go → lang/cmd/sx/testdata/errmsg/x.go b/cmd/sx/testdata/errmsg/x.go → lang/cmd/sx/testdata/errmsg/x.go
diff --git a/cmd/sx/testdata/errmsg/x1_test.go → lang/cmd/sx/testdata/errmsg/x1_test.go b/cmd/sx/testdata/errmsg/x1_test.go → lang/cmd/sx/testdata/errmsg/x1_test.go
diff --git a/cmd/sx/testdata/errmsg/x_test.go → lang/cmd/sx/testdata/errmsg/x_test.go b/cmd/sx/testdata/errmsg/x_test.go → lang/cmd/sx/testdata/errmsg/x_test.go
diff --git a/cmd/sx/testdata/local/easy.go → lang/cmd/sx/testdata/local/easy.go b/cmd/sx/testdata/local/easy.go → lang/cmd/sx/testdata/local/easy.go
diff --git a/cmd/sx/testdata/local/easysub/easysub.go → .../cmd/sx/testdata/local/easysub/easysub.go b/cmd/sx/testdata/local/easysub/easysub.go → .../cmd/sx/testdata/local/easysub/easysub.go
diff --git a/cmd/sx/testdata/local/easysub/main.go → lang/cmd/sx/testdata/local/easysub/main.go b/cmd/sx/testdata/local/easysub/main.go → lang/cmd/sx/testdata/local/easysub/main.go
diff --git a/cmd/sx/testdata/local/hard.go → lang/cmd/sx/testdata/local/hard.go b/cmd/sx/testdata/local/hard.go → lang/cmd/sx/testdata/local/hard.go
diff --git a/cmd/sx/testdata/local/sub/sub.go → lang/cmd/sx/testdata/local/sub/sub.go b/cmd/sx/testdata/local/sub/sub.go → lang/cmd/sx/testdata/local/sub/sub.go
diff --git a/cmd/sx/testdata/local/sub/sub/subsub.go → lang/cmd/sx/testdata/local/sub/sub/subsub.go b/cmd/sx/testdata/local/sub/sub/subsub.go → lang/cmd/sx/testdata/local/sub/sub/subsub.go
diff --git a/...sx/testdata/src/go-cmd-test/helloworld.go → ...sx/testdata/src/go-cmd-test/helloworld.go b/...sx/testdata/src/go-cmd-test/helloworld.go → ...sx/testdata/src/go-cmd-test/helloworld.go
diff --git a/cmd/sx/testdata/testimport/p.go → lang/cmd/sx/testdata/testimport/p.go b/cmd/sx/testdata/testimport/p.go → lang/cmd/sx/testdata/testimport/p.go
diff --git a/cmd/sx/testdata/testimport/p1/p1.go → lang/cmd/sx/testdata/testimport/p1/p1.go b/cmd/sx/testdata/testimport/p1/p1.go → lang/cmd/sx/testdata/testimport/p1/p1.go
diff --git a/cmd/sx/testdata/testimport/p2/p2.go → lang/cmd/sx/testdata/testimport/p2/p2.go b/cmd/sx/testdata/testimport/p2/p2.go → lang/cmd/sx/testdata/testimport/p2/p2.go
diff --git a/cmd/sx/testdata/testimport/p_test.go → lang/cmd/sx/testdata/testimport/p_test.go b/cmd/sx/testdata/testimport/p_test.go → lang/cmd/sx/testdata/testimport/p_test.go
diff --git a/cmd/sx/testdata/testimport/x_test.go → lang/cmd/sx/testdata/testimport/x_test.go b/cmd/sx/testdata/testimport/x_test.go → lang/cmd/sx/testdata/testimport/x_test.go
diff --git a/cmd/sx/testflag.go → lang/cmd/sx/testflag.go b/cmd/sx/testflag.go → lang/cmd/sx/testflag.go
diff --git a/cmd/sx/tool.go → lang/cmd/sx/tool.go b/cmd/sx/tool.go → lang/cmd/sx/tool.go
@@ -6,7 +6,7 @@ package main
 
 import (
 	"fmt"
-	"github.com/fd/simplex/build"
+	"github.com/fd/simplex/lang/build"
 	"os"
 	"os/exec"
 	"path/filepath"

diff --git a/cmd/sx/vcs.go → lang/cmd/sx/vcs.go b/cmd/sx/vcs.go → lang/cmd/sx/vcs.go
diff --git a/cmd/sx/version.go → lang/cmd/sx/version.go b/cmd/sx/version.go → lang/cmd/sx/version.go
diff --git a/cmd/sx/vet.go → lang/cmd/sx/vet.go b/cmd/sx/vet.go → lang/cmd/sx/vet.go
diff --git a/cmd/sxc/main.go → lang/cmd/sxc/main.go b/cmd/sxc/main.go → lang/cmd/sxc/main.go
@@ -3,7 +3,7 @@ package main
 import (
 	"flag"
 	"fmt"
-	"github.com/fd/simplex/compiler"
+	"github.com/fd/simplex/lang/compiler"
 	"os"
 	"strings"
 )

diff --git a/cmd/sxdoc/README.godoc-app → lang/cmd/sxdoc/README.godoc-app b/cmd/sxdoc/README.godoc-app → lang/cmd/sxdoc/README.godoc-app
diff --git a/cmd/sxdoc/appinit.go → lang/cmd/sxdoc/appinit.go b/cmd/sxdoc/appinit.go → lang/cmd/sxdoc/appinit.go
diff --git a/cmd/sxdoc/codewalk.go → lang/cmd/sxdoc/codewalk.go b/cmd/sxdoc/codewalk.go → lang/cmd/sxdoc/codewalk.go
diff --git a/cmd/sxdoc/dirtrees.go → lang/cmd/sxdoc/dirtrees.go b/cmd/sxdoc/dirtrees.go → lang/cmd/sxdoc/dirtrees.go
@@ -8,9 +8,9 @@ package main
 
 import (
 	"bytes"
-	"github.com/fd/simplex/doc"
-	"github.com/fd/simplex/parser"
-	"github.com/fd/simplex/token"
+	"github.com/fd/simplex/lang/doc"
+	"github.com/fd/simplex/lang/parser"
+	"github.com/fd/simplex/lang/token"
 	"log"
 	"os"
 	pathpkg "path"

diff --git a/cmd/sxdoc/doc.go → lang/cmd/sxdoc/doc.go b/cmd/sxdoc/doc.go → lang/cmd/sxdoc/doc.go
diff --git a/cmd/sxdoc/filesystem.go → lang/cmd/sxdoc/filesystem.go b/cmd/sxdoc/filesystem.go → lang/cmd/sxdoc/filesystem.go
diff --git a/cmd/sxdoc/format.go → lang/cmd/sxdoc/format.go b/cmd/sxdoc/format.go → lang/cmd/sxdoc/format.go
@@ -12,8 +12,8 @@ package main
 
 import (
 	"fmt"
-	"github.com/fd/simplex/scanner"
-	"github.com/fd/simplex/token"
+	"github.com/fd/simplex/lang/scanner"
+	"github.com/fd/simplex/lang/token"
 	"io"
 	"regexp"
 	"strconv"

diff --git a/cmd/sxdoc/godoc.go → lang/cmd/sxdoc/godoc.go b/cmd/sxdoc/godoc.go → lang/cmd/sxdoc/godoc.go
@@ -9,12 +9,12 @@ import (
 	"encoding/json"
 	"flag"
 	"fmt"
-	"github.com/fd/simplex/ast"
-	"github.com/fd/simplex/build"
-	"github.com/fd/simplex/doc"
-	"github.com/fd/simplex/format"
-	"github.com/fd/simplex/printer"
-	"github.com/fd/simplex/token"
+	"github.com/fd/simplex/lang/ast"
+	"github.com/fd/simplex/lang/build"
+	"github.com/fd/simplex/lang/doc"
+	"github.com/fd/simplex/lang/format"
+	"github.com/fd/simplex/lang/printer"
+	"github.com/fd/simplex/lang/token"
 	"io"
 	"io/ioutil"
 	"log"

diff --git a/cmd/sxdoc/index.go → lang/cmd/sxdoc/index.go b/cmd/sxdoc/index.go → lang/cmd/sxdoc/index.go
@@ -42,9 +42,9 @@ import (
 	"bytes"
 	"encoding/gob"
 	"errors"
-	"github.com/fd/simplex/ast"
-	"github.com/fd/simplex/parser"
-	"github.com/fd/simplex/token"
+	"github.com/fd/simplex/lang/ast"
+	"github.com/fd/simplex/lang/parser"
+	"github.com/fd/simplex/lang/token"
 	"index/suffixarray"
 	"io"
 	"os"

diff --git a/cmd/sxdoc/main.go → lang/cmd/sxdoc/main.go b/cmd/sxdoc/main.go → lang/cmd/sxdoc/main.go
@@ -34,9 +34,9 @@ import (
 	_ "expvar" // to serve /debug/vars
 	"flag"
 	"fmt"
-	"github.com/fd/simplex/ast"
-	"github.com/fd/simplex/build"
-	"github.com/fd/simplex/printer"
+	"github.com/fd/simplex/lang/ast"
+	"github.com/fd/simplex/lang/build"
+	"github.com/fd/simplex/lang/printer"
 	"io"
 	"log"
 	"net/http"

diff --git a/cmd/sxdoc/parser.go → lang/cmd/sxdoc/parser.go b/cmd/sxdoc/parser.go → lang/cmd/sxdoc/parser.go
@@ -10,9 +10,9 @@
 package main
 
 import (
-	"github.com/fd/simplex/ast"
-	"github.com/fd/simplex/parser"
-	"github.com/fd/simplex/token"
+	"github.com/fd/simplex/lang/ast"
+	"github.com/fd/simplex/lang/parser"
+	"github.com/fd/simplex/lang/token"
 	"os"
 	pathpkg "path"
 )

diff --git a/cmd/sxdoc/play-appengine.go → lang/cmd/sxdoc/play-appengine.go b/cmd/sxdoc/play-appengine.go → lang/cmd/sxdoc/play-appengine.go
diff --git a/cmd/sxdoc/play-local.go → lang/cmd/sxdoc/play-local.go b/cmd/sxdoc/play-local.go → lang/cmd/sxdoc/play-local.go
diff --git a/cmd/sxdoc/play.go → lang/cmd/sxdoc/play.go b/cmd/sxdoc/play.go → lang/cmd/sxdoc/play.go
@@ -9,7 +9,7 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/fd/simplex/format"
+	"github.com/fd/simplex/lang/format"
 	"net/http"
 )
 

diff --git a/cmd/sxdoc/setup-godoc-app.bash → lang/cmd/sxdoc/setup-godoc-app.bash b/cmd/sxdoc/setup-godoc-app.bash → lang/cmd/sxdoc/setup-godoc-app.bash
diff --git a/cmd/sxdoc/snippet.go → lang/cmd/sxdoc/snippet.go b/cmd/sxdoc/snippet.go → lang/cmd/sxdoc/snippet.go
@@ -12,8 +12,8 @@ package main
 import (
 	"bytes"
 	"fmt"
-	"github.com/fd/simplex/ast"
-	"github.com/fd/simplex/token"
+	"github.com/fd/simplex/lang/ast"
+	"github.com/fd/simplex/lang/token"
 )
 
 type Snippet struct {

diff --git a/cmd/sxdoc/spec.go → lang/cmd/sxdoc/spec.go b/cmd/sxdoc/spec.go → lang/cmd/sxdoc/spec.go
diff --git a/cmd/sxdoc/template.go → lang/cmd/sxdoc/template.go b/cmd/sxdoc/template.go → lang/cmd/sxdoc/template.go
diff --git a/cmd/sxdoc/throttle.go → lang/cmd/sxdoc/throttle.go b/cmd/sxdoc/throttle.go → lang/cmd/sxdoc/throttle.go
diff --git a/cmd/sxdoc/utils.go → lang/cmd/sxdoc/utils.go b/cmd/sxdoc/utils.go → lang/cmd/sxdoc/utils.go
diff --git a/cmd/sxdoc/zip.go → lang/cmd/sxdoc/zip.go b/cmd/sxdoc/zip.go → lang/cmd/sxdoc/zip.go
diff --git a/cmd/sxfmt/doc.go → lang/cmd/sxfmt/doc.go b/cmd/sxfmt/doc.go → lang/cmd/sxfmt/doc.go
diff --git a/cmd/sxfmt/gofmt.go → lang/cmd/sxfmt/gofmt.go b/cmd/sxfmt/gofmt.go → lang/cmd/sxfmt/gofmt.go
@@ -8,11 +8,11 @@ import (
 	"bytes"
 	"flag"
 	"fmt"
-	"github.com/fd/simplex/ast"
-	"github.com/fd/simplex/parser"
-	"github.com/fd/simplex/printer"
-	"github.com/fd/simplex/scanner"
-	"github.com/fd/simplex/token"
+	"github.com/fd/simplex/lang/ast"
+	"github.com/fd/simplex/lang/parser"
+	"github.com/fd/simplex/lang/printer"
+	"github.com/fd/simplex/lang/scanner"
+	"github.com/fd/simplex/lang/token"
 	"io"
 	"io/ioutil"
 	"os"

diff --git a/cmd/sxfmt/gofmt.go.gofmt → lang/cmd/sxfmt/gofmt.go.gofmt b/cmd/sxfmt/gofmt.go.gofmt → lang/cmd/sxfmt/gofmt.go.gofmt
@@ -8,11 +8,11 @@ import (
 	"bytes"
 	"flag"
 	"fmt"
-	"github.com/fd/simplex/ast"
-	"github.com/fd/simplex/parser"
-	"github.com/fd/simplex/printer"
-	"github.com/fd/simplex/scanner"
-	"github.com/fd/simplex/token"
+	"github.com/fd/simplex/lang/ast"
+	"github.com/fd/simplex/lang/parser"
+	"github.com/fd/simplex/lang/printer"
+	"github.com/fd/simplex/lang/scanner"
+	"github.com/fd/simplex/lang/token"
 	"io"
 	"io/ioutil"
 	"os"

diff --git a/cmd/sxfmt/gofmt_test.go → lang/cmd/sxfmt/gofmt_test.go b/cmd/sxfmt/gofmt_test.go → lang/cmd/sxfmt/gofmt_test.go
diff --git a/cmd/sxfmt/gofmt_test.go.gofmt → lang/cmd/sxfmt/gofmt_test.go.gofmt b/cmd/sxfmt/gofmt_test.go.gofmt → lang/cmd/sxfmt/gofmt_test.go.gofmt
diff --git a/cmd/sxfmt/long_test.go → lang/cmd/sxfmt/long_test.go b/cmd/sxfmt/long_test.go → lang/cmd/sxfmt/long_test.go
@@ -12,9 +12,9 @@ import (
 	"bytes"
 	"flag"
 	"fmt"
-	"github.com/fd/simplex/ast"
-	"github.com/fd/simplex/printer"
-	"github.com/fd/simplex/token"
+	"github.com/fd/simplex/lang/ast"
+	"github.com/fd/simplex/lang/printer"
+	"github.com/fd/simplex/lang/token"
 	"io"
 	"os"
 	"path/filepath"

diff --git a/cmd/sxfmt/rewrite.go → lang/cmd/sxfmt/rewrite.go b/cmd/sxfmt/rewrite.go → lang/cmd/sxfmt/rewrite.go
@@ -6,9 +6,9 @@ package main
 
 import (
 	"fmt"
-	"github.com/fd/simplex/ast"
-	"github.com/fd/simplex/parser"
-	"github.com/fd/simplex/token"
+	"github.com/fd/simplex/lang/ast"
+	"github.com/fd/simplex/lang/parser"
+	"github.com/fd/simplex/lang/token"
 	"os"
 	"reflect"
 	"strings"

diff --git a/cmd/sxfmt/simplify.go → lang/cmd/sxfmt/simplify.go b/cmd/sxfmt/simplify.go → lang/cmd/sxfmt/simplify.go
@@ -5,8 +5,8 @@
 package main
 
 import (
-	"github.com/fd/simplex/ast"
-	"github.com/fd/simplex/token"
+	"github.com/fd/simplex/lang/ast"
+	"github.com/fd/simplex/lang/token"
 	"reflect"
 )
 

diff --git a/cmd/sxfmt/testdata/.gitattributes → lang/cmd/sxfmt/testdata/.gitattributes b/cmd/sxfmt/testdata/.gitattributes → lang/cmd/sxfmt/testdata/.gitattributes
diff --git a/cmd/sxfmt/testdata/comments.golden → lang/cmd/sxfmt/testdata/comments.golden b/cmd/sxfmt/testdata/comments.golden → lang/cmd/sxfmt/testdata/comments.golden
diff --git a/cmd/sxfmt/testdata/comments.input → lang/cmd/sxfmt/testdata/comments.input b/cmd/sxfmt/testdata/comments.input → lang/cmd/sxfmt/testdata/comments.input
diff --git a/cmd/sxfmt/testdata/composites.golden → lang/cmd/sxfmt/testdata/composites.golden b/cmd/sxfmt/testdata/composites.golden → lang/cmd/sxfmt/testdata/composites.golden
diff --git a/cmd/sxfmt/testdata/composites.input → lang/cmd/sxfmt/testdata/composites.input b/cmd/sxfmt/testdata/composites.input → lang/cmd/sxfmt/testdata/composites.input
diff --git a/cmd/sxfmt/testdata/crlf.golden → lang/cmd/sxfmt/testdata/crlf.golden b/cmd/sxfmt/testdata/crlf.golden → lang/cmd/sxfmt/testdata/crlf.golden
diff --git a/cmd/sxfmt/testdata/crlf.input → lang/cmd/sxfmt/testdata/crlf.input b/cmd/sxfmt/testdata/crlf.input → lang/cmd/sxfmt/testdata/crlf.input
diff --git a/cmd/sxfmt/testdata/import.golden → lang/cmd/sxfmt/testdata/import.golden b/cmd/sxfmt/testdata/import.golden → lang/cmd/sxfmt/testdata/import.golden
diff --git a/cmd/sxfmt/testdata/import.input → lang/cmd/sxfmt/testdata/import.input b/cmd/sxfmt/testdata/import.input → lang/cmd/sxfmt/testdata/import.input
diff --git a/cmd/sxfmt/testdata/old.golden → lang/cmd/sxfmt/testdata/old.golden b/cmd/sxfmt/testdata/old.golden → lang/cmd/sxfmt/testdata/old.golden
diff --git a/cmd/sxfmt/testdata/old.input → lang/cmd/sxfmt/testdata/old.input b/cmd/sxfmt/testdata/old.input → lang/cmd/sxfmt/testdata/old.input
diff --git a/cmd/sxfmt/testdata/rewrite1.golden → lang/cmd/sxfmt/testdata/rewrite1.golden b/cmd/sxfmt/testdata/rewrite1.golden → lang/cmd/sxfmt/testdata/rewrite1.golden
diff --git a/cmd/sxfmt/testdata/rewrite1.input → lang/cmd/sxfmt/testdata/rewrite1.input b/cmd/sxfmt/testdata/rewrite1.input → lang/cmd/sxfmt/testdata/rewrite1.input
diff --git a/cmd/sxfmt/testdata/rewrite2.golden → lang/cmd/sxfmt/testdata/rewrite2.golden b/cmd/sxfmt/testdata/rewrite2.golden → lang/cmd/sxfmt/testdata/rewrite2.golden
diff --git a/cmd/sxfmt/testdata/rewrite2.input → lang/cmd/sxfmt/testdata/rewrite2.input b/cmd/sxfmt/testdata/rewrite2.input → lang/cmd/sxfmt/testdata/rewrite2.input
diff --git a/cmd/sxfmt/testdata/rewrite3.golden → lang/cmd/sxfmt/testdata/rewrite3.golden b/cmd/sxfmt/testdata/rewrite3.golden → lang/cmd/sxfmt/testdata/rewrite3.golden
diff --git a/cmd/sxfmt/testdata/rewrite3.input → lang/cmd/sxfmt/testdata/rewrite3.input b/cmd/sxfmt/testdata/rewrite3.input → lang/cmd/sxfmt/testdata/rewrite3.input
diff --git a/cmd/sxfmt/testdata/rewrite4.golden → lang/cmd/sxfmt/testdata/rewrite4.golden b/cmd/sxfmt/testdata/rewrite4.golden → lang/cmd/sxfmt/testdata/rewrite4.golden
diff --git a/cmd/sxfmt/testdata/rewrite4.input → lang/cmd/sxfmt/testdata/rewrite4.input b/cmd/sxfmt/testdata/rewrite4.input → lang/cmd/sxfmt/testdata/rewrite4.input
diff --git a/cmd/sxfmt/testdata/rewrite5.golden → lang/cmd/sxfmt/testdata/rewrite5.golden b/cmd/sxfmt/testdata/rewrite5.golden → lang/cmd/sxfmt/testdata/rewrite5.golden
diff --git a/cmd/sxfmt/testdata/rewrite5.input → lang/cmd/sxfmt/testdata/rewrite5.input b/cmd/sxfmt/testdata/rewrite5.input → lang/cmd/sxfmt/testdata/rewrite5.input
diff --git a/cmd/sxfmt/testdata/slices1.golden → lang/cmd/sxfmt/testdata/slices1.golden b/cmd/sxfmt/testdata/slices1.golden → lang/cmd/sxfmt/testdata/slices1.golden
diff --git a/cmd/sxfmt/testdata/slices1.input → lang/cmd/sxfmt/testdata/slices1.input b/cmd/sxfmt/testdata/slices1.input → lang/cmd/sxfmt/testdata/slices1.input
diff --git a/cmd/sxfmt/testdata/slices2.golden → lang/cmd/sxfmt/testdata/slices2.golden b/cmd/sxfmt/testdata/slices2.golden → lang/cmd/sxfmt/testdata/slices2.golden
diff --git a/cmd/sxfmt/testdata/slices2.input → lang/cmd/sxfmt/testdata/slices2.input b/cmd/sxfmt/testdata/slices2.input → lang/cmd/sxfmt/testdata/slices2.input
diff --git a/cmd/sxfmt/testdata/stdin1.golden → lang/cmd/sxfmt/testdata/stdin1.golden b/cmd/sxfmt/testdata/stdin1.golden → lang/cmd/sxfmt/testdata/stdin1.golden
diff --git a/cmd/sxfmt/testdata/stdin1.golden.gofmt → lang/cmd/sxfmt/testdata/stdin1.golden.gofmt b/cmd/sxfmt/testdata/stdin1.golden.gofmt → lang/cmd/sxfmt/testdata/stdin1.golden.gofmt
diff --git a/cmd/sxfmt/testdata/stdin1.input → lang/cmd/sxfmt/testdata/stdin1.input b/cmd/sxfmt/testdata/stdin1.input → lang/cmd/sxfmt/testdata/stdin1.input
diff --git a/cmd/sxfmt/testdata/stdin1.input.gofmt → lang/cmd/sxfmt/testdata/stdin1.input.gofmt b/cmd/sxfmt/testdata/stdin1.input.gofmt → lang/cmd/sxfmt/testdata/stdin1.input.gofmt
diff --git a/cmd/sxfmt/testdata/stdin2.golden → lang/cmd/sxfmt/testdata/stdin2.golden b/cmd/sxfmt/testdata/stdin2.golden → lang/cmd/sxfmt/testdata/stdin2.golden
diff --git a/cmd/sxfmt/testdata/stdin2.golden.gofmt → lang/cmd/sxfmt/testdata/stdin2.golden.gofmt b/cmd/sxfmt/testdata/stdin2.golden.gofmt → lang/cmd/sxfmt/testdata/stdin2.golden.gofmt
diff --git a/cmd/sxfmt/testdata/stdin2.input → lang/cmd/sxfmt/testdata/stdin2.input b/cmd/sxfmt/testdata/stdin2.input → lang/cmd/sxfmt/testdata/stdin2.input
diff --git a/cmd/sxfmt/testdata/stdin2.input.gofmt → lang/cmd/sxfmt/testdata/stdin2.input.gofmt b/cmd/sxfmt/testdata/stdin2.input.gofmt → lang/cmd/sxfmt/testdata/stdin2.input.gofmt
diff --git a/cmd/sxfmt/testdata/stdin3.golden → lang/cmd/sxfmt/testdata/stdin3.golden b/cmd/sxfmt/testdata/stdin3.golden → lang/cmd/sxfmt/testdata/stdin3.golden
diff --git a/cmd/sxfmt/testdata/stdin3.golden.gofmt → lang/cmd/sxfmt/testdata/stdin3.golden.gofmt b/cmd/sxfmt/testdata/stdin3.golden.gofmt → lang/cmd/sxfmt/testdata/stdin3.golden.gofmt
diff --git a/cmd/sxfmt/testdata/stdin3.input → lang/cmd/sxfmt/testdata/stdin3.input b/cmd/sxfmt/testdata/stdin3.input → lang/cmd/sxfmt/testdata/stdin3.input
diff --git a/cmd/sxfmt/testdata/stdin3.input.gofmt → lang/cmd/sxfmt/testdata/stdin3.input.gofmt b/cmd/sxfmt/testdata/stdin3.input.gofmt → lang/cmd/sxfmt/testdata/stdin3.input.gofmt
diff --git a/cmd/sxfmt/testdata/stdin4.golden → lang/cmd/sxfmt/testdata/stdin4.golden b/cmd/sxfmt/testdata/stdin4.golden → lang/cmd/sxfmt/testdata/stdin4.golden
diff --git a/cmd/sxfmt/testdata/stdin4.golden.gofmt → lang/cmd/sxfmt/testdata/stdin4.golden.gofmt b/cmd/sxfmt/testdata/stdin4.golden.gofmt → lang/cmd/sxfmt/testdata/stdin4.golden.gofmt
diff --git a/cmd/sxfmt/testdata/stdin4.input → lang/cmd/sxfmt/testdata/stdin4.input b/cmd/sxfmt/testdata/stdin4.input → lang/cmd/sxfmt/testdata/stdin4.input
diff --git a/cmd/sxfmt/testdata/stdin4.input.gofmt → lang/cmd/sxfmt/testdata/stdin4.input.gofmt b/cmd/sxfmt/testdata/stdin4.input.gofmt → lang/cmd/sxfmt/testdata/stdin4.input.gofmt
diff --git a/cmd/sxfmt/testdata/typeswitch.golden → lang/cmd/sxfmt/testdata/typeswitch.golden b/cmd/sxfmt/testdata/typeswitch.golden → lang/cmd/sxfmt/testdata/typeswitch.golden
diff --git a/cmd/sxfmt/testdata/typeswitch.input → lang/cmd/sxfmt/testdata/typeswitch.input b/cmd/sxfmt/testdata/typeswitch.input → lang/cmd/sxfmt/testdata/typeswitch.input
diff --git a/compiler/context.go → lang/compiler/context.go b/compiler/context.go → lang/compiler/context.go
diff --git a/compiler/converter.go → lang/compiler/converter.go b/compiler/converter.go → lang/compiler/converter.go
diff --git a/compiler/parser.go → lang/compiler/parser.go b/compiler/parser.go → lang/compiler/parser.go
diff --git a/compiler/printer.go → lang/compiler/printer.go b/compiler/printer.go → lang/compiler/printer.go
diff --git a/compiler/type_checker.go → lang/compiler/type_checker.go b/compiler/type_checker.go → lang/compiler/type_checker.go
diff --git a/compiler/type_printer.go → lang/compiler/type_printer.go b/compiler/type_printer.go → lang/compiler/type_printer.go
diff --git a/compiler/types.go → lang/compiler/types.go b/compiler/types.go → lang/compiler/types.go
diff --git a/doc/Makefile → lang/doc/Makefile b/doc/Makefile → lang/doc/Makefile
diff --git a/doc/comment.go → lang/doc/comment.go b/doc/comment.go → lang/doc/comment.go
diff --git a/doc/comment_test.go → lang/doc/comment_test.go b/doc/comment_test.go → lang/doc/comment_test.go
diff --git a/doc/doc.go → lang/doc/doc.go b/doc/doc.go → lang/doc/doc.go
diff --git a/doc/doc_test.go → lang/doc/doc_test.go b/doc/doc_test.go → lang/doc/doc_test.go
diff --git a/doc/example.go → lang/doc/example.go b/doc/example.go → lang/doc/example.go
diff --git a/doc/example_test.go → lang/doc/example_test.go b/doc/example_test.go → lang/doc/example_test.go
diff --git a/doc/exports.go → lang/doc/exports.go b/doc/exports.go → lang/doc/exports.go
diff --git a/doc/filter.go → lang/doc/filter.go b/doc/filter.go → lang/doc/filter.go
diff --git a/doc/headscan.go → lang/doc/headscan.go b/doc/headscan.go → lang/doc/headscan.go
diff --git a/doc/reader.go → lang/doc/reader.go b/doc/reader.go → lang/doc/reader.go
diff --git a/doc/synopsis.go → lang/doc/synopsis.go b/doc/synopsis.go → lang/doc/synopsis.go
diff --git a/doc/synopsis_test.go → lang/doc/synopsis_test.go b/doc/synopsis_test.go → lang/doc/synopsis_test.go
diff --git a/doc/testdata/a.0.golden → lang/doc/testdata/a.0.golden b/doc/testdata/a.0.golden → lang/doc/testdata/a.0.golden
diff --git a/doc/testdata/a.1.golden → lang/doc/testdata/a.1.golden b/doc/testdata/a.1.golden → lang/doc/testdata/a.1.golden
diff --git a/doc/testdata/a.2.golden → lang/doc/testdata/a.2.golden b/doc/testdata/a.2.golden → lang/doc/testdata/a.2.golden
diff --git a/doc/testdata/a0.go → lang/doc/testdata/a0.go b/doc/testdata/a0.go → lang/doc/testdata/a0.go
diff --git a/doc/testdata/a1.go → lang/doc/testdata/a1.go b/doc/testdata/a1.go → lang/doc/testdata/a1.go
diff --git a/doc/testdata/b.0.golden → lang/doc/testdata/b.0.golden b/doc/testdata/b.0.golden → lang/doc/testdata/b.0.golden
diff --git a/doc/testdata/b.1.golden → lang/doc/testdata/b.1.golden b/doc/testdata/b.1.golden → lang/doc/testdata/b.1.golden
diff --git a/doc/testdata/b.2.golden → lang/doc/testdata/b.2.golden b/doc/testdata/b.2.golden → lang/doc/testdata/b.2.golden
diff --git a/doc/testdata/b.go → lang/doc/testdata/b.go b/doc/testdata/b.go → lang/doc/testdata/b.go
diff --git a/doc/testdata/benchmark.go → lang/doc/testdata/benchmark.go b/doc/testdata/benchmark.go → lang/doc/testdata/benchmark.go
diff --git a/doc/testdata/c.0.golden → lang/doc/testdata/c.0.golden b/doc/testdata/c.0.golden → lang/doc/testdata/c.0.golden
diff --git a/doc/testdata/c.1.golden → lang/doc/testdata/c.1.golden b/doc/testdata/c.1.golden → lang/doc/testdata/c.1.golden
diff --git a/doc/testdata/c.2.golden → lang/doc/testdata/c.2.golden b/doc/testdata/c.2.golden → lang/doc/testdata/c.2.golden
diff --git a/doc/testdata/c.go → lang/doc/testdata/c.go b/doc/testdata/c.go → lang/doc/testdata/c.go
diff --git a/doc/testdata/d.0.golden → lang/doc/testdata/d.0.golden b/doc/testdata/d.0.golden → lang/doc/testdata/d.0.golden
diff --git a/doc/testdata/d.1.golden → lang/doc/testdata/d.1.golden b/doc/testdata/d.1.golden → lang/doc/testdata/d.1.golden
diff --git a/doc/testdata/d.2.golden → lang/doc/testdata/d.2.golden b/doc/testdata/d.2.golden → lang/doc/testdata/d.2.golden
diff --git a/doc/testdata/d1.go → lang/doc/testdata/d1.go b/doc/testdata/d1.go → lang/doc/testdata/d1.go
diff --git a/doc/testdata/d2.go → lang/doc/testdata/d2.go b/doc/testdata/d2.go → lang/doc/testdata/d2.go
diff --git a/doc/testdata/e.0.golden → lang/doc/testdata/e.0.golden b/doc/testdata/e.0.golden → lang/doc/testdata/e.0.golden
diff --git a/doc/testdata/e.1.golden → lang/doc/testdata/e.1.golden b/doc/testdata/e.1.golden → lang/doc/testdata/e.1.golden
diff --git a/doc/testdata/e.2.golden → lang/doc/testdata/e.2.golden b/doc/testdata/e.2.golden → lang/doc/testdata/e.2.golden
diff --git a/doc/testdata/e.go → lang/doc/testdata/e.go b/doc/testdata/e.go → lang/doc/testdata/e.go
diff --git a/doc/testdata/error1.0.golden → lang/doc/testdata/error1.0.golden b/doc/testdata/error1.0.golden → lang/doc/testdata/error1.0.golden
diff --git a/doc/testdata/error1.1.golden → lang/doc/testdata/error1.1.golden b/doc/testdata/error1.1.golden → lang/doc/testdata/error1.1.golden
diff --git a/doc/testdata/error1.2.golden → lang/doc/testdata/error1.2.golden b/doc/testdata/error1.2.golden → lang/doc/testdata/error1.2.golden
diff --git a/doc/testdata/error1.go → lang/doc/testdata/error1.go b/doc/testdata/error1.go → lang/doc/testdata/error1.go
diff --git a/doc/testdata/error2.0.golden → lang/doc/testdata/error2.0.golden b/doc/testdata/error2.0.golden → lang/doc/testdata/error2.0.golden
diff --git a/doc/testdata/error2.1.golden → lang/doc/testdata/error2.1.golden b/doc/testdata/error2.1.golden → lang/doc/testdata/error2.1.golden
diff --git a/doc/testdata/error2.2.golden → lang/doc/testdata/error2.2.golden b/doc/testdata/error2.2.golden → lang/doc/testdata/error2.2.golden
diff --git a/doc/testdata/error2.go → lang/doc/testdata/error2.go b/doc/testdata/error2.go → lang/doc/testdata/error2.go
diff --git a/doc/testdata/example.go → lang/doc/testdata/example.go b/doc/testdata/example.go → lang/doc/testdata/example.go
diff --git a/doc/testdata/f.0.golden → lang/doc/testdata/f.0.golden b/doc/testdata/f.0.golden → lang/doc/testdata/f.0.golden
diff --git a/doc/testdata/f.1.golden → lang/doc/testdata/f.1.golden b/doc/testdata/f.1.golden → lang/doc/testdata/f.1.golden
diff --git a/doc/testdata/f.2.golden → lang/doc/testdata/f.2.golden b/doc/testdata/f.2.golden → lang/doc/testdata/f.2.golden
diff --git a/doc/testdata/f.go → lang/doc/testdata/f.go b/doc/testdata/f.go → lang/doc/testdata/f.go
diff --git a/doc/testdata/template.txt → lang/doc/testdata/template.txt b/doc/testdata/template.txt → lang/doc/testdata/template.txt
diff --git a/doc/testdata/testing.0.golden → lang/doc/testdata/testing.0.golden b/doc/testdata/testing.0.golden → lang/doc/testdata/testing.0.golden
diff --git a/doc/testdata/testing.1.golden → lang/doc/testdata/testing.1.golden b/doc/testdata/testing.1.golden → lang/doc/testdata/testing.1.golden
diff --git a/doc/testdata/testing.2.golden → lang/doc/testdata/testing.2.golden b/doc/testdata/testing.2.golden → lang/doc/testdata/testing.2.golden
diff --git a/doc/testdata/testing.go → lang/doc/testdata/testing.go b/doc/testdata/testing.go → lang/doc/testdata/testing.go
diff --git a/format/format.go → lang/format/format.go b/format/format.go → lang/format/format.go
diff --git a/format/format_test.go → lang/format/format_test.go b/format/format_test.go → lang/format/format_test.go
diff --git a/parser/error_test.go → lang/parser/error_test.go b/parser/error_test.go → lang/parser/error_test.go
diff --git a/parser/example_test.go → lang/parser/example_test.go b/parser/example_test.go → lang/parser/example_test.go
diff --git a/parser/interface.go → lang/parser/interface.go b/parser/interface.go → lang/parser/interface.go
diff --git a/parser/parser.go → lang/parser/parser.go b/parser/parser.go → lang/parser/parser.go
diff --git a/parser/parser_sx.go → lang/parser/parser_sx.go b/parser/parser_sx.go → lang/parser/parser_sx.go
diff --git a/parser/parser_test.go → lang/parser/parser_test.go b/parser/parser_test.go → lang/parser/parser_test.go
diff --git a/parser/performance_test.go → lang/parser/performance_test.go b/parser/performance_test.go → lang/parser/performance_test.go
diff --git a/parser/short_test.go → lang/parser/short_test.go b/parser/short_test.go → lang/parser/short_test.go
diff --git a/parser/testdata/commas.src → lang/parser/testdata/commas.src b/parser/testdata/commas.src → lang/parser/testdata/commas.src
diff --git a/parser/testdata/issue3106.src → lang/parser/testdata/issue3106.src b/parser/testdata/issue3106.src → lang/parser/testdata/issue3106.src
diff --git a/printer/example_test.go → lang/printer/example_test.go b/printer/example_test.go → lang/printer/example_test.go
diff --git a/printer/nodes.go → lang/printer/nodes.go b/printer/nodes.go → lang/printer/nodes.go
diff --git a/printer/performance_test.go → lang/printer/performance_test.go b/printer/performance_test.go → lang/printer/performance_test.go
diff --git a/printer/printer.go → lang/printer/printer.go b/printer/printer.go → lang/printer/printer.go
diff --git a/printer/printer_test.go → lang/printer/printer_test.go b/printer/printer_test.go → lang/printer/printer_test.go
diff --git a/printer/testdata/comments.golden → lang/printer/testdata/comments.golden b/printer/testdata/comments.golden → lang/printer/testdata/comments.golden
diff --git a/printer/testdata/comments.input → lang/printer/testdata/comments.input b/printer/testdata/comments.input → lang/printer/testdata/comments.input
diff --git a/printer/testdata/comments.x → lang/printer/testdata/comments.x b/printer/testdata/comments.x → lang/printer/testdata/comments.x
diff --git a/printer/testdata/comments2.golden → lang/printer/testdata/comments2.golden b/printer/testdata/comments2.golden → lang/printer/testdata/comments2.golden
diff --git a/printer/testdata/comments2.input → lang/printer/testdata/comments2.input b/printer/testdata/comments2.input → lang/printer/testdata/comments2.input
diff --git a/printer/testdata/declarations.golden → lang/printer/testdata/declarations.golden b/printer/testdata/declarations.golden → lang/printer/testdata/declarations.golden
diff --git a/printer/testdata/declarations.input → lang/printer/testdata/declarations.input b/printer/testdata/declarations.input → lang/printer/testdata/declarations.input
diff --git a/printer/testdata/empty.golden → lang/printer/testdata/empty.golden b/printer/testdata/empty.golden → lang/printer/testdata/empty.golden
diff --git a/printer/testdata/empty.input → lang/printer/testdata/empty.input b/printer/testdata/empty.input → lang/printer/testdata/empty.input
diff --git a/printer/testdata/expressions.golden → lang/printer/testdata/expressions.golden b/printer/testdata/expressions.golden → lang/printer/testdata/expressions.golden
diff --git a/printer/testdata/expressions.input → lang/printer/testdata/expressions.input b/printer/testdata/expressions.input → lang/printer/testdata/expressions.input
diff --git a/printer/testdata/expressions.raw → lang/printer/testdata/expressions.raw b/printer/testdata/expressions.raw → lang/printer/testdata/expressions.raw
diff --git a/printer/testdata/linebreaks.golden → lang/printer/testdata/linebreaks.golden b/printer/testdata/linebreaks.golden → lang/printer/testdata/linebreaks.golden
diff --git a/printer/testdata/linebreaks.input → lang/printer/testdata/linebreaks.input b/printer/testdata/linebreaks.input → lang/printer/testdata/linebreaks.input
diff --git a/printer/testdata/parser.go → lang/printer/testdata/parser.go b/printer/testdata/parser.go → lang/printer/testdata/parser.go
diff --git a/printer/testdata/slow.golden → lang/printer/testdata/slow.golden b/printer/testdata/slow.golden → lang/printer/testdata/slow.golden
diff --git a/printer/testdata/slow.input → lang/printer/testdata/slow.input b/printer/testdata/slow.input → lang/printer/testdata/slow.input
diff --git a/printer/testdata/statements.golden → lang/printer/testdata/statements.golden b/printer/testdata/statements.golden → lang/printer/testdata/statements.golden
diff --git a/printer/testdata/statements.input → lang/printer/testdata/statements.input b/printer/testdata/statements.input → lang/printer/testdata/statements.input
diff --git a/scanner/errors.go → lang/scanner/errors.go b/scanner/errors.go → lang/scanner/errors.go
@@ -6,7 +6,7 @@ package scanner
 
 import (
 	"fmt"
-	"github.com/fd/simplex/token"
+	"github.com/fd/simplex/lang/token"
 	"io"
 	"sort"
 )

diff --git a/scanner/example_test.go → lang/scanner/example_test.go b/scanner/example_test.go → lang/scanner/example_test.go
@@ -6,8 +6,8 @@ package scanner_test
 
 import (
 	"fmt"
-	"github.com/fd/simplex/scanner"
-	"github.com/fd/simplex/token"
+	"github.com/fd/simplex/lang/scanner"
+	"github.com/fd/simplex/lang/token"
 )
 
 func ExampleScanner_Scan() {

diff --git a/scanner/scanner.go → lang/scanner/scanner.go b/scanner/scanner.go → lang/scanner/scanner.go
@@ -11,7 +11,7 @@ package scanner
 import (
 	"bytes"
 	"fmt"
-	"github.com/fd/simplex/token"
+	"github.com/fd/simplex/lang/token"
 	"path/filepath"
 	"strconv"
 	"unicode"