Permalink
Browse files

merging master

  • Loading branch information...
1 parent 9c1c279 commit 575c90688a546608b205d4ac1cfc0364865c8594 Mattis Jeppsson committed May 19, 2010
Showing with 11 additions and 7 deletions.
  1. +2 −1 haskell.js
  2. +9 −6 typecheckertests.html
View
@@ -3,5 +3,6 @@ var haskell = {
interpreter: {},
ast: {},
primitives: {},
- utilities: {}
+ utilities: {},
+ typechecker: {}
};
View
@@ -1,12 +1,15 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<script src="lib/jsparse.js" type="text/javascript"></script>
- <script src="haskell.js" type="text/javascript"></script>
- <script src="haskell.ast.js" type="text/javascript"></script>
- <script src="haskell.parser.js" type="text/javascript"></script>
- <script src="haskell.interpreter.js" type="text/javascript"></script>
- <script src="haskell.typechecker.js" type="text/javascript"></script>
- <script type="text/javascript" src="typecheckertests.js" />
+ <script src="haskell.js" type="text/javascript"></script>
+ <script src="haskell.utilities.js" type="text/javascript"></script>
+ <script src="haskell.ast.js" type="text/javascript"></script>
+ <script src="haskell.parser.js" type="text/javascript"></script>
+ <script src="haskell.primitives.js" type="text/javascript"></script>
+ <script src="haskell.interpreter.js" type="text/javascript"></script>
+ <script src="haskell.typechecker.js" type="text/javascript"></script>
+ <script src="typecheckertests.js" type="text/javascript"></script>
+
<script type="text/javascript">
/* fireunit.ok(true, "Passing test result");
fireunit.ok(false, "Failing test result.");

0 comments on commit 575c906

Please sign in to comment.