From 702337f6f98171c2f96315e9a1166ba223e209f1 Mon Sep 17 00:00:00 2001
From: Danny Yoo <dyoo@cs.wpi.edu>
Date: Fri, 27 May 2011 11:08:33 -0400
Subject: [PATCH] trying to trace issue with arity matching

---
 compiler/compiler.rkt                       |  2 +
 compiler/kernel-primitives.rkt              |  2 +
 js-assembler/assemble-perform-statement.rkt |  4 +-
 js-assembler/mini-runtime.js                | 80 ++++++++++++---------
 js-assembler/package.rkt                    |  9 +--
 lang/base.rkt                               |  3 +
 6 files changed, 60 insertions(+), 40 deletions(-)
 create mode 100644 lang/base.rkt

diff --git a/compiler/compiler.rkt b/compiler/compiler.rkt
index 022fed4..64858c9 100644
--- a/compiler/compiler.rkt
+++ b/compiler/compiler.rkt
@@ -362,6 +362,8 @@
          (make-PopControlFrame)
          #;(make-DebugPrint (make-Const "Returning from module invokation."))
          #;(make-DebugPrint (make-Reg 'proc))
+         
+         (make-PerformStatement (make-FinalizeModuleInvokation! path))
          (make-GotoStatement (make-Reg 'proc))
          
          after-module-body)))]))
diff --git a/compiler/kernel-primitives.rkt b/compiler/kernel-primitives.rkt
index e342769..08dc837 100644
--- a/compiler/kernel-primitives.rkt
+++ b/compiler/kernel-primitives.rkt
@@ -62,6 +62,8 @@
                                     'apply
                                     
 
+                                    'for-each
+                                    'current-print
                                     ))
 (define-predicate KernelPrimitiveName? KernelPrimitiveName)
 
diff --git a/js-assembler/assemble-perform-statement.rkt b/js-assembler/assemble-perform-statement.rkt
index b8f07e4..1c98907 100644
--- a/js-assembler/assemble-perform-statement.rkt
+++ b/js-assembler/assemble-perform-statement.rkt
@@ -158,4 +158,6 @@
              (symbol->string (ModuleLocator-name (AliasModuleName!-from op))))]
 
     [(FinalizeModuleInvokation!? op)
-     (format "MACHINE.modules[~s].finalizeModuleInvokation();")]))
+     (format "MACHINE.modules[~s].finalizeModuleInvokation();"
+             (symbol->string
+              (ModuleLocator-name (FinalizeModuleInvokation!-path op))))]))
diff --git a/js-assembler/mini-runtime.js b/js-assembler/mini-runtime.js
index 46f5cc9..acf7e8b 100644
--- a/js-assembler/mini-runtime.js
+++ b/js-assembler/mini-runtime.js
@@ -496,40 +496,54 @@
 
 
 
-    // This should be attached to the module corresponding for print-values
-    Primitives['print-values'] = new Closure(
-        function(MACHINE) {
-	    var outputPort = MACHINE.params.currentOutputPort;
-            var prependNewline = false;
-            if (MACHINE.argcount > 0) {
-                if (MACHINE.val !== undefined) {
-                    if (prependNewline) {
-                        outputPort.write(MACHINE, "\n");
-                    }
-	            outputPort.write(MACHINE, MACHINE.val);
-                    prependNewline = true;
-                }
+    Primitives['current-print'] = function(MACHINE) {
+	return new Closure(
+	    function(MACHINE) {
+		var elt = MACHINE.env.pop();
+		var outputPort = MACHINE.params.currentOutputPort;
+		outputPort.write(MACHINE, elt);
+		var frame = MACHINE.control.pop();
+		return frame.label(MACHINE);
+	    },
+	    1,
+	    [],
+	    "printer")
+    };
 
-                for(var i = 0; i < MACHINE.argcount - 1; i++) {
-                    if (MACHINE.env[MACHINE.env.length - 1 - i] !== undefined) {
-	                if (prependNewline) {
-                            outputPort.write(MACHINE, "\n");
-                        }
-                        outputPort.write(MACHINE,
-                                         MACHINE.env[MACHINE.env.length - 1 - i]);
-                        prependNewline = true;
-                    }
-                }
-	        outputPort.write(MACHINE, "\n");
-            }
-            MACHINE.env.length = MACHINE.env.length - MACHINE.argcount;
-            var frame = MACHINE.control.pop();
-            return frame.label(MACHINE);
-        },
-        new ArityAtLeast(0),
-        [],
-        "print-values"
-    );
+//     // This should be attached to the module corresponding for print-values
+//     Primitives['print-values'] = new Closure(
+//         function(MACHINE) {
+// 	    var outputPort = MACHINE.params.currentOutputPort;
+//             var prependNewline = false;
+//             if (MACHINE.argcount > 0) {
+//                 if (MACHINE.val !== undefined) {
+//                     if (prependNewline) {
+//                         outputPort.write(MACHINE, "\n");
+//                     }
+// 	            outputPort.write(MACHINE, MACHINE.val);
+//                     prependNewline = true;
+//                 }
+
+//                 for(var i = 0; i < MACHINE.argcount - 1; i++) {
+//                     if (MACHINE.env[MACHINE.env.length - 1 - i] !== undefined) {
+// 	                if (prependNewline) {
+//                             outputPort.write(MACHINE, "\n");
+//                         }
+//                         outputPort.write(MACHINE,
+//                                          MACHINE.env[MACHINE.env.length - 1 - i]);
+//                         prependNewline = true;
+//                     }
+//                 }
+// 	        outputPort.write(MACHINE, "\n");
+//             }
+//             MACHINE.env.length = MACHINE.env.length - MACHINE.argcount;
+//             var frame = MACHINE.control.pop();
+//             return frame.label(MACHINE);
+//         },
+//         new ArityAtLeast(0),
+//         [],
+//         "print-values"
+//     );
 
 
 
diff --git a/js-assembler/package.rkt b/js-assembler/package.rkt
index a629ed5..c66ac85 100644
--- a/js-assembler/package.rkt
+++ b/js-assembler/package.rkt
@@ -92,7 +92,7 @@ EOF
 
 
   ;; FIXME: Finally, invoke the main module.
-  (fprintf op #<<EOF
+  (display (quote-as-cdata #<<EOF
 
 var invokeMainModule = function() {
     var MACHINE = new plt.runtime.Machine();
@@ -124,9 +124,6 @@ var invokeMainModule = function() {
                }
            });
 };
-</script>
-<body onload='invokeMainModule()'>
-</body>
-</html>
 EOF
-          ))
\ No newline at end of file
+          ) op)
+  (display "  </script>\n<body onload='invokeMainModule()'>\n</body>\n</html>" op))
diff --git a/lang/base.rkt b/lang/base.rkt
new file mode 100644
index 0000000..8fd79d9
--- /dev/null
+++ b/lang/base.rkt
@@ -0,0 +1,3 @@
+#lang s-exp "kernel.rkt"
+(provide (all-from-out "kernel.rkt"))
+(require racket/private/modbeg)
\ No newline at end of file