diff --git a/CONTRIBUTORS b/CONTRIBUTORS new file mode 100644 --- /dev/null +++ b/CONTRIBUTORS @@ -0,0 +1,3 @@ +The following people have contributed to Syntactic: + + * Anders Persson diff --git a/syntactic.cabal b/syntactic.cabal --- a/syntactic.cabal +++ b/syntactic.cabal @@ -1,5 +1,5 @@ Name: syntactic -Version: 1.2 +Version: 1.2.1 Synopsis: Generic abstract syntax, and utilities for embedded languages Description: This library provides: . @@ -53,10 +53,9 @@ Tested-with: GHC==7.6.1, GHC==7.4.2 extra-source-files: - examples/NanoFeldspar/Core.hs - examples/NanoFeldspar/Extra.hs - examples/NanoFeldspar/Vector.hs - examples/NanoFeldspar/Test.hs + CONTRIBUTORS + examples/NanoFeldspar/*.hs + tests/gold/*.txt source-repository head type: darcs diff --git a/tests/gold/prog1.txt b/tests/gold/prog1.txt new file mode 100644 --- /dev/null +++ b/tests/gold/prog1.txt @@ -0,0 +1,19 @@ +Lambda 0 +| +`- Lambda 1 + | + `- parallel + | + +- var:0 + | + `- Lambda 2 + | + `- min + | + +- (+) + | | + | +- var:2 + | | + | `- 3 + | + `- var:1 diff --git a/tests/gold/prog2.txt b/tests/gold/prog2.txt new file mode 100644 --- /dev/null +++ b/tests/gold/prog2.txt @@ -0,0 +1,15 @@ +Lambda 0 +| +`- Let 1 + | + +- min + | | + | +- var:0 + | | + | `- var:0 + | + `- max + | + +- var:1 + | + `- var:1 diff --git a/tests/gold/prog3.txt b/tests/gold/prog3.txt new file mode 100644 --- /dev/null +++ b/tests/gold/prog3.txt @@ -0,0 +1,63 @@ +Lambda 0 +| +`- Lambda 1 + | + `- Let 4 + | + +- (+) + | | + | +- (-) + | | | + | | +- max + | | | | + | | | +- var:0 + | | | | + | | | `- var:1 + | | | + | | `- min + | | | + | | +- var:0 + | | | + | | `- var:1 + | | + | `- 1 + | + `- Let 5 + | + +- min + | | + | +- var:0 + | | + | `- var:1 + | + `- forLoop + | + +- var:4 + | + +- 0 + | + `- Lambda 2 + | + `- Let 6 + | + +- (+) + | | + | +- (-) + | | | + | | +- (-) + | | | | + | | | +- var:4 + | | | | + | | | `- var:2 + | | | + | | `- 1 + | | + | `- var:5 + | + `- Lambda 3 + | + `- (+) + | + +- var:6 + | + `- var:3 diff --git a/tests/gold/prog4.txt b/tests/gold/prog4.txt new file mode 100644 --- /dev/null +++ b/tests/gold/prog4.txt @@ -0,0 +1,49 @@ +Let 4 +| ++- Lambda 1 +| | +| `- Let 2 +| | +| +- sel1 +| | | +| | `- var:1 +| | +| `- Let 3 +| | +| +- sel2 +| | | +| | `- var:1 +| | +| `- (*) +| | +| +- (-) +| | | +| | +- var:2 +| | | +| | `- var:3 +| | +| `- (-) +| | +| +- var:3 +| | +| `- var:2 +| +`- Lambda 0 + | + `- Let + | + +- tup2 + | | + | +- (*) + | | | + | | +- var:0 + | | | + | | `- 2 + | | + | `- (*) + | | + | +- var:0 + | | + | `- 3 + | + `- var:4 diff --git a/tests/gold/prog5.txt b/tests/gold/prog5.txt new file mode 100644 --- /dev/null +++ b/tests/gold/prog5.txt @@ -0,0 +1,71 @@ +Let 9 +| ++- parallel +| | +| +- (+) +| | | +| | +- (-) +| | | | +| | | +- 20 +| | | | +| | | `- 1 +| | | +| | `- 1 +| | +| `- Lambda 0 +| | +| `- (+) +| | +| +- var:0 +| | +| `- 1 +| +`- Let 11 + | + +- forLoop + | | + | +- arrLength + | | | + | | `- var:9 + | | + | +- 0 + | | + | `- Lambda 2 + | | + | `- Let 10 + | | + | +- (*) + | | | + | | +- getIx + | | | | + | | | +- var:9 + | | | | + | | | `- var:2 + | | | + | | `- 2 + | | + | `- Lambda 3 + | | + | `- (+) + | | + | +- var:10 + | | + | `- var:3 + | + `- (+) + | + +- (+) + | | + | +- (*) + | | | + | | +- getIx + | | | | + | | | +- var:9 + | | | | + | | | `- 1 + | | | + | | `- 2 + | | + | `- var:11 + | + `- var:11 diff --git a/tests/gold/prog6.txt b/tests/gold/prog6.txt new file mode 100644 --- /dev/null +++ b/tests/gold/prog6.txt @@ -0,0 +1,25 @@ +Let 1 +| ++- max +| | +| +- 5 +| | +| `- (+) +| | +| +- 6 +| | +| `- 7 +| +`- Lambda 0 + | + `- condition + | + +- (==) + | | + | +- var:0 + | | + | `- 10 + | + +- var:1 + | + `- var:1 diff --git a/tests/gold/prog7.txt b/tests/gold/prog7.txt new file mode 100644 --- /dev/null +++ b/tests/gold/prog7.txt @@ -0,0 +1,39 @@ +Lambda 0 +| +`- Let 3 + | + +- parallel + | | + | +- 10 + | | + | `- Lambda 1 + | | + | `- (+) + | | + | +- var:1 + | | + | `- var:0 + | + `- condition + | + +- (==) + | | + | +- (*) + | | | + | | +- (*) + | | | | + | | | +- (*) + | | | | | + | | | | +- var:0 + | | | | | + | | | | `- var:0 + | | | | + | | | `- var:0 + | | | + | | `- var:0 + | | + | `- 23 + | + +- var:3 + | + `- var:3