Changeset 22016

Timestamp:

08/22/08 22:40:36 (3 months ago)

Author:

pmurias

Message:

[mold] reverted ruoso's change to identifier, might have made the CMakeLists work with preivous versions of cmake

Location:

v6/smop

Files:

• CMakeLists.txt (modified) (2 diffs)
• m0ld/M0ld.hs (modified) (2 diffs)
• src/smop_mold.c (modified) (4 diffs)

v6/smop/CMakeLists.txt

@@ -1 +1 @@
 project (smop)
+SET( CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE )
 cmake_minimum_required (VERSION 2.6)
 include_directories (${smop_SOURCE_DIR}/include)
@@ -17 +18 @@
         COMMAND ${CABAL} ARGS build --distpref=${CMAKE_CURRENT_BINARY_DIR}/cabal_dist
         COMMAND cp ARGS ${CMAKE_CURRENT_BINARY_DIR}/cabal_dist/build/m0ld/m0ld ${CMAKE_CURRENT_BINARY_DIR}/m0ld_exe
+        DEPENDS ${smop_SOURCE_DIR}/m0ld/M0ld.hs
     )
 

v6/smop/m0ld/M0ld.hs

@@ -23 +23 @@
 identifier = do
     first <- choice [alphaNum, char '_']
-    rest <- many1 $ choice [alphaNum, char '_', digit, char '^', char '!']
+    rest <- many1 $ choice [alphaNum, char '_', digit , char '!']
     return $ [first] ++ rest
 
@@ -89 +89 @@
         Nothing ->
             do 
-                let new = "xxx"++(show $ Map.size decls)
+                let new = "___implicit_register___"++(show $ Map.size decls)
                 updateState $ Map.insert c new
                 decls <- getState

v6/smop/src/smop_mold.c

@@ -129 +129 @@
 static SMOP__Object* get_register(SMOP__Object* interpreter,smop_mold_frame* frame) {
   smop_mold* mold = (smop_mold*) frame->mold;
-  //printf("reading register %d from position %d\n",mold->opcodes[frame->position],frame->position);
   if (!frame->registers[mold->opcodes[frame->position]]) {
     printf("reading empty register %d\n",mold->opcodes[frame->position]);
@@ -200 +199 @@
   } else if (SMOP__ID__eval == identifier) {
     int op = mold->opcodes[frame->position];
-    //printf("op: %d\n",op);
     if (op) {
-      //int from = frame->position; //for tracing
       frame->position++;
       ret = SMOP__NATIVE__bool_true;
@@ -232 +229 @@
           free(call_pos);
           SMOP__Object* ret = SMOP_DISPATCH(interpreter,SMOP_RI(call_invocant),call_identifier,capture);
-          //printf("got %p putting it into %d\n",ret,target);
           if (frame->registers[target]) {
             SMOP_RELEASE(interpreter,frame->registers[target]);
@@ -292 +288 @@
       }
 
-      /*
-        for (i=from;i<frame->position;i++) {
-        printf("%d ",mold->opcodes[i]);
-      }
-      printf("\n");
-      for (i=0;i<mold->registers;i++) {
-        if (frame->registers[i]) {
-          printf("%d = %s\n",i,frame->registers[i]->RI->id);
-        } else {
-          printf("%d = (null)\n",i,frame->registers[i]);
-        }
-      }*/
     } else {
       ret = SMOP__NATIVE__bool_false;