merging master

johang88 · May 19, 2010 · 575c906 · 575c906
1 parent 9c1c279
commit 575c906
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/haskell.js b/haskell.js
@@ -3,5 +3,6 @@ var haskell = {
     interpreter: {},
     ast: {},
     primitives: {},
-    utilities: {}
+    utilities: {},
+    typechecker: {}
 };
diff --git a/typecheckertests.html b/typecheckertests.html
@@ -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.");