Changeset 22254 for v6

Timestamp:

09/15/08 17:01:58 (3 months ago)

Author:

pmurias

Message:

[smop][pugs]
pugs generates working m0ld
added a very simple test for that
m0ld also accepts ? as an ascii replacement for ¢

Location:

v6/smop

Files:

• CMakeLists.txt (modified) (3 diffs)
• m0ld/M0ld.hs (modified) (1 diff)
• test/33_pugs_simple.p6-pugs (added)
• test/modified_pugs_output.m0ld (deleted)
• tools/dsl (modified) (1 diff)

v6/smop/CMakeLists.txt

@@ -61 +61 @@
     )
 endmacro(compile_perl6)
+
+macro (compile_perl6_pugs dsl_file)
+    string(REGEX REPLACE ".p6-pugs$" ".m0ld" m0ld_file ${dsl_file})
+    string(REGEX REPLACE ".m0ld$" ".c" c_file ${m0ld_file})
+    add_custom_command (
+        OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${c_file}
+        OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${m0ld_file}
+        COMMAND perl ARGS ${smop_SOURCE_DIR}/tools/dsl p6-pugs ${smop_SOURCE_DIR}/ ${CMAKE_CURRENT_BINARY_DIR}/m0ld_exe ${smop_SOURCE_DIR}/${dsl_file} ${CMAKE_CURRENT_BINARY_DIR}/${m0ld_file}
+        COMMAND perl ARGS ${smop_SOURCE_DIR}/tools/dsl m0ld ${smop_SOURCE_DIR}/ ${CMAKE_CURRENT_BINARY_DIR}/m0ld_exe ${CMAKE_CURRENT_BINARY_DIR}/${m0ld_file} ${CMAKE_CURRENT_BINARY_DIR}/${c_file}
+        DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/m0ld_exe
+        DEPENDS ${smop_SOURCE_DIR}/${dsl_file}
+        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../../pugs
+    )
+endmacro(compile_perl6_pugs)
 
 foreach (sm0p_file
@@ -151 +165 @@
     test/31_int_postfix_plusplus.m0ld
     test/32_array_iterator.m0ld
-    test/modified_pugs_output.m0ld
+    test/33_pugs_simple.p6-pugs
 )
     set(c_file)
@@ -163 +177 @@
         compile_perl6 (${test_file})
         string(REGEX REPLACE "\\.p6$" ".c" c_file ${test_file})
+    elseif (test_file MATCHES "\\.p6-pugs$")
+        compile_perl6_pugs (${test_file})
+        string(REGEX REPLACE "\\.p6-pugs$" ".c" c_file ${test_file})
     elseif (test_file MATCHES "\\.c$")
         set(c_file ${test_file})

v6/smop/m0ld/M0ld.hs

@@ -61 +61 @@
 constant = choice 
       [ do
-          char '¢'
+          (char '¢') <|> (char '?')
           name <- identifier
           return $ Var name

v6/smop/tools/dsl

@@ -11 +11 @@
 } elsif ($dsl eq 'p6') {
     system("perl $elfX -C m0ld -s $in > $out");
+} elsif ($dsl eq 'p6-pugs') {
+    system("$base/../../pugs -Cm0ld $in > $out");
 } else {
     die "unknown DSL\n";