Move ParseTree library and other PEG-specific things to tools/peg

ParseTree is a PEG type, not specific to the compiler.

PEG and compiler depend on each other, but moving specific parts to
their directories still makes sense.

Author: osa1

compiler/DeriveEq.fir

@@ -1,7 +1,7 @@
 import Grammar
 import Lexer
-import PegTestLib
-import Scanner
+import Peg.PegTestLib
+import Compiler.Scanner
 
 main(args: Array[Str]):
     if args.len() < 2:
@@ -216,6 +216,7 @@ type Token:
     line: U32
     col: U32")
 
+# args: -iPeg=tools/peg -iCompiler=compiler
 # args after: -- --test
 # expected stdout:
 # impl[Eq[t]] Eq[Option[t]]:

compiler/ExprGrammarTest.fir

@@ -1,6 +1,6 @@
 import Grammar
 import Lexer
-import PegTestLib
+import Peg.PegTestLib
 
 
 main(args: Array[Str]):
@@ -98,6 +98,8 @@ runInlineExprScan(input: Str):
 runBlockExprScan(input: Str):
     runTestScanner_(input, blockExpr)
 
+# args: -iPeg=tools/peg -iCompiler=compiler
+
 # expected stdout:
 # hi
 # InlineExpr(PrefixExpr(SimpleExpr(LowerId(1:1:"hi"))))

compiler/Grammar.fir

@@ -1,6 +1,6 @@
 # This is generated file, do not edit.
 
-import ParseTree
+import Peg.ParseTree
 import Token
 
 type NonTerminal:

compiler/Grammar.peg

@@ -1,4 +1,4 @@
-import ParseTree
+import Peg.ParseTree
 import Token
 
 type Terminal = Token

compiler/ImplGrammarTest.fir

@@ -1,6 +1,6 @@
 import Grammar
 import Lexer
-import PegTestLib
+import Peg.PegTestLib
 
 
 main(args: Array[Str]):
@@ -20,6 +20,8 @@ impl[ToStr[a]] ToStr[Vec[a]]:
 runTopDecl(input: Str):
     runTestScanner_(input, topDecl)
 
+# args: -iPeg=tools/peg -iCompiler=compiler
+
 # expected stdout:
 # impl Foo[T]
 # TopDecl(

compiler/ImportGrammarTest.fir

@@ -1,6 +1,6 @@
 import Grammar
 import Lexer
-import PegTestLib
+import Peg.PegTestLib
 
 
 main(args: Array[Str]):
@@ -15,6 +15,8 @@ import Foo.Bar.Baz")
 runTopDecl(input: Str):
     runTestScanner_(input, topDecl)
 
+# args: -iPeg=tools/peg -iCompiler=compiler
+
 # expected stdout:
 # import Foo
 # TopDecl(ImportDecl(Import(1:1:"import"), UpperId(1:8:"Foo")))

compiler/TopFunDeclGrammarTest.fir

@@ -1,6 +1,6 @@
 import Grammar
 import Lexer
-import PegTestLib
+import Peg.PegTestLib
 
 
 main(args: Array[Str]):
@@ -18,6 +18,8 @@ f():
 runTopDecl(input: Str):
     runTestScanner_(input, topDecl)
 
+# args: -iPeg=tools/peg -iCompiler=compiler
+
 # expected stdout:
 # f(): 1
 # TopDecl(

compiler/TraitGrammarTest.fir

@@ -1,6 +1,6 @@
 import Grammar
 import Lexer
-import PegTestLib
+import Peg.PegTestLib
 
 
 main(args: Array[Str]):
@@ -26,6 +26,8 @@ trait Blah[t]:
 runTopDecl(input: Str):
     runTestScanner_(input, topDecl)
 
+# args: -iPeg=tools/peg -iCompiler=compiler
+
 # expected stdout:
 # trait RecRow[t]
 # TopDecl(

compiler/TypeGrammarTest.fir

@@ -1,6 +1,6 @@
 import Grammar
 import Lexer
-import PegTestLib
+import Peg.PegTestLib
 
 main(args: Array[Str]):
     if args.len() > 2:
@@ -80,6 +80,8 @@ type MapResult[iter, item, b, exnOld, exnNew]:
 
     ()
 
+# args: -iPeg=tools/peg -iCompiler=compiler
+
 # expected stdout:
 # asdf
 # Type_(LowerId(1:1:"asdf"))

compiler/tests/parse.sh

@@ -12,7 +12,7 @@ source "${SCRIPT_DIR}/common.sh"
 
 for f in "${files[@]}"; do
     echo $f
-    ./target/release/fir compiler/Parser.fir -- "$f"
+    ./target/release/fir -iCompiler=compiler -iPeg=tools/peg compiler/Parser.fir -- "$f"
     if [ $? -ne 0 ]; then
         exit_code=1
     fi