Fix internal definitions in the Gambit compiler so it can be run inte…

…rpreted
feeley · Apr 5, 2014 · f19dd23 · f19dd23
1 parent fdd2c10
commit f19dd23
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 24 deletions.
diff --git a/gsc/_prims.scm b/gsc/_prims.scm
@@ -2539,37 +2539,37 @@
                   conditional-op-sym
                   vars))))))
 
-  (define case-fx=
-    (gen-simple-case **fixnum?-sym **fx=-sym))
+  (let ()
 
-  (define case-fx<
-    (gen-simple-case **fixnum?-sym **fx<-sym))
+    (define case-fx=
+      (gen-simple-case **fixnum?-sym **fx=-sym))
 
-  (define case-fx>
-    (gen-simple-case **fixnum?-sym **fx>-sym))
+    (define case-fx<
+      (gen-simple-case **fixnum?-sym **fx<-sym))
 
-  (define case-fx<=
-    (gen-simple-case **fixnum?-sym **fx<=-sym))
+    (define case-fx>
+      (gen-simple-case **fixnum?-sym **fx>-sym))
 
-  (define case-fx>=
-    (gen-simple-case **fixnum?-sym **fx>=-sym))
+    (define case-fx<=
+      (gen-simple-case **fixnum?-sym **fx<=-sym))
 
-  (define case-fxzero?
-    (gen-simple-case **fixnum?-sym **fxzero?-sym))
+    (define case-fx>=
+      (gen-simple-case **fixnum?-sym **fx>=-sym))
 
-  (define case-fxpositive?
-    (gen-simple-case **fixnum?-sym **fxpositive?-sym))
+    (define case-fxzero?
+      (gen-simple-case **fixnum?-sym **fxzero?-sym))
 
-  (define case-fxnegative?
-    (gen-simple-case **fixnum?-sym **fxnegative?-sym))
+    (define case-fxpositive?
+      (gen-simple-case **fixnum?-sym **fxpositive?-sym))
 
-  (define case-fxodd?
-    (gen-simple-case **fixnum?-sym **fxodd?-sym))
+    (define case-fxnegative?
+      (gen-simple-case **fixnum?-sym **fxnegative?-sym))
 
-  (define case-fxeven?
-    (gen-simple-case **fixnum?-sym **fxeven?-sym))
+    (define case-fxodd?
+      (gen-simple-case **fixnum?-sym **fxodd?-sym))
 
-  (let ()
+    (define case-fxeven?
+      (gen-simple-case **fixnum?-sym **fxeven?-sym))
 
     (define case-fxmax
       (gen-validating-case
@@ -3797,7 +3797,8 @@
          result)))
    type-patterns))
 
-(define constant-folder-gen constant-folder)
+(define (constant-folder-gen op . type-patterns)
+  (apply constant-folder (cons op type-patterns)))
 
 (define (constant-folder-fix op . type-patterns)
   (constant-folder-with-ptree-maker

diff --git a/include/stamp.h b/include/stamp.h
@@ -2,5 +2,5 @@
  * Time stamp of last source code repository commit.
  */
 
-#define ___STAMP_YMD 20140404
-#define ___STAMP_HMS 190211
+#define ___STAMP_YMD 20140405
+#define ___STAMP_HMS 134151