diff options
author | Herbert Valerio Riedel <hvr@gnu.org> | 2014-01-12 11:40:09 +0100 |
---|---|---|
committer | Herbert Valerio Riedel <hvr@gnu.org> | 2014-01-12 12:47:17 +0100 |
commit | 66693401b98cb5aa912948af7bbd2182474f50c4 (patch) | |
tree | ab176320c561668c9ac13e684c9cc8ae6e4535f6 /testsuite/tests/programs/joao-circular/joao-circular.stdout | |
parent | a924debcbb3dc5c004f988fcc1b480a01ba276dd (diff) | |
parent | ad233cf68ea436c84e931c5bdb9f803308708e09 (diff) | |
download | haskell-66693401b98cb5aa912948af7bbd2182474f50c4.tar.gz |
Fold testsuite.git into ghc.git (re #8545)
This commit performs a subtree merge of testsuite.git into ghc.git;
The next commit will adapt `sync-all` et al. to the new situation.
At the time of merge, testsuite.git was at commit
[998a816ae89c4fd573f4abd7c6abb346cf7ee9af/testsuite]
The following steps have been used to accomplish this merge:
1. Clone a fresh testsuite.git copy (& cd into)
2. Remove accidentally committed binary files from history
git filter-branch \
--index-filter "git rm -r --cached --ignore-unmatch \
tests/haddock/should_compile_flag_nohaddock/a.out \
tests/haddock/should_compile_noflag_nohaddock/a.out \
tests/ghc-regress/haddock/should_compile_flag_nohaddock/a.out \
tests/ghc-regress/haddock/should_compile_noflag_nohaddock/a.out \
tests/ghc-regress/dph/diophantine/dph-diophantine-fast \
tests/ghc-regress/dph/diophantine/dph-diophantine-opt \
tests/ghc-regress/dph/primespj/dph-primespj-fast \
tests/ghc-regress/dph/quickhull/dph-quickhull-fast \
tests/ghc-regress/dph/smvm/dph-smvm \
tests/ghc-regress/dph/sumnats/dph-sumnats \
tests/ghc-regress/dph/words/dph-words-fast \
tests/ghc-regress/plugins/plugins01" \
HEAD
3. Rename all paths in testsuite.git to be prefixed with `testsuite/`
git filter-branch -f --prune-empty --tree-filter \
"mkdir -p testsuite; \
git ls-tree --name-only \$GIT_COMMIT | xargs -I files mv files testsuite/"
4. cd into ghc/ checkout, and perform subtree merge of testsuite into ghc
(see also http://nuclearsquid.com/writings/subtree-merging-and-you/)
cd ../ghc/
git remote add -f testsuite ../testsuite/.git
git merge -s ours --no-commit testsuite/master
git read-tree --prefix=/ -u testsuite/master
git commit
Signed-off-by: Herbert Valerio Riedel <hvr@gnu.org>
Diffstat (limited to 'testsuite/tests/programs/joao-circular/joao-circular.stdout')
-rw-r--r-- | testsuite/tests/programs/joao-circular/joao-circular.stdout | 86 |
1 files changed, 86 insertions, 0 deletions
diff --git a/testsuite/tests/programs/joao-circular/joao-circular.stdout b/testsuite/tests/programs/joao-circular/joao-circular.stdout new file mode 100644 index 0000000000..0c69f85dbc --- /dev/null +++ b/testsuite/tests/programs/joao-circular/joao-circular.stdout @@ -0,0 +1,86 @@ +["inp","40"] +Pretty Printed Input: +Int = a +Int = b +Int = c +Int = a +fact(Int x,) : Int +{ fact = 1; + while x > 0fact = fact * x; + x = x - 1;; +} +recfact(Int x,) : Int +{ if(x == 0)then{ recfact = 1; + } + else{ recfact = x * recfact(x - 1); + }; +} +MSP Generated Code: +MEMORIA DE DADOS +"a0" TAM 1 +"b0" TAM 1 +"c0" TAM 1 +"a0" TAM 1 +"fact0" TAM 1 +"x" TAM 1 +"recfact1" TAM 1 +"x" TAM 2 +CODIGO +CALL "main" +HALT +C_Ident_1 "fact": +PUSHa "fact" 1 +PUSHi 1 +STORE +C_Ident_1 "while_1": +PUSHa "x" 1 +LOAD +PUSHi 0 +GT +JMPF "end_while_1" +PUSHa "fact" 1 +PUSHa "fact" 1 +LOAD +PUSHa "x" 1 +LOAD +MUL +STORE +PUSHa "x" 1 +PUSHa "x" 1 +LOAD +PUSHi 1 +SUB +STORE +JMP "while_1" +C_Ident_1 "end_while_1": +RET +C_Ident_1 "recfact": +PUSHa "x" 2 +LOAD +PUSHi 0 +EQ +JMPF "else_1" +PUSHa "recfact" 2 +PUSHi 1 +STORE +JMPF "end_if_1" +C_Ident_1 "else_1": +PUSHa "recfact" 2 +PUSHa "x" 2 +LOAD +PUSHa "x" 1 +PUSHa "x" 2 +LOAD +PUSHi 1 +SUB +STORE +CALL "recfact" +MUL +STORE +C_Ident_1 "end_if_1": +RET + + +Detected Semantic Errors: +[C_E_Name_AD_1 (C_Ident_1 "a")] +[] |