hydra-www.ietfng.org Git

]> hydra-www.ietfng.org Git - dyna2/commit

author	Tim Vieira <tim.f.vieira@gmail.com>
	Thu, 11 Jul 2013 18:43:46 +0000 (14:43 -0400)
committer	Tim Vieira <tim.f.vieira@gmail.com>
	Thu, 11 Jul 2013 18:43:46 +0000 (14:43 -0400)
commit	6fc273aed95a1dfffa49c58ced03dd14fddff403
tree	395d1d90d76d26fd8ba0d65079495038b437a762	tree \| snapshot
parent	a2ae581e7fea00ac0aaf821d92a8f6815c0fd61a	commit \| diff
parent	5ff33881a3d15f55a790d7b8b7ef3e74b0d2c4c5	commit \| diff

Merge branch 'master' of ssh://github.com/nwf/dyna

Conflicts:
src/Dyna/Backend/Python/Backend.hs
src/Dyna/Backend/Python/interpreter.py

Had to make a small change to pretty printing of @nwf's new representation of
true and false (they need to print as *lower case* true and false).

RSS Atom

src/Dyna/Backend/Python/Backend.hs	diff1 \|	diff2 \|	blob \| history
src/Dyna/Backend/Python/Selftest.hs	diff1 \|	diff2 \|	blob \| history
src/Dyna/Backend/Python/interpreter.py	diff1 \|	diff2 \|	blob \| history
src/Dyna/Backend/Python/stdlib.py	diff1 \|	diff2 \|	blob \| history
src/Dyna/Term/TTerm.hs	diff1 \|	diff2 \|	blob \| history