refactor with the opcode load_language

fperrad · Sep 6, 2009 · 7809a4f · 7809a4f
1 parent a99bd85
commit 7809a4f
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 8 deletions.
diff --git a/config/makefiles/root.in b/config/makefiles/root.in
@@ -73,7 +73,7 @@ GEN_PIR := \
 build: \
  $(WMLSCRIPT_OPS) \
  $(WMLSCRIPT_GROUP) \
- library/WMLScript.pbc \
+ wmlscript/wmlscript.pbc \
  $(PBCS)
 
 all: build wmlsi@exe@ wmlsd@exe@ installable
@@ -96,9 +96,9 @@ wmlsd.pbc: wmlsd.pir
 wmlsd@exe@: wmlsd.pbc
 	$(PBC_TO_EXE) wmlsd.pbc
 
-library/WMLScript.pbc: src/WMLScript.pir \
+wmlscript/wmlscript.pbc: src/WMLScript.pir \
  src/script.pir src/wmlsstdlibs.pir $(GEN_PIR)
-	$(PARROT) -o library/WMLScript.pbc src/WMLScript.pir
+	$(PARROT) -o wmlscript/wmlscript.pbc src/WMLScript.pir
 
 src/opcode.pir: src/translation.rules build/translator.pl \
  build/SRM/Stack.pm build/SRM/Register.pm

diff --git a/src/script.pir b/src/script.pir
@@ -102,7 +102,7 @@
 
   $P0 = get_hll_global '@stdlibs'
   unless null $P0 goto L1
-  load_bytecode 'library/WMLScript.pbc'
+  load_language 'wmlscript'
 L1:
 PIRCODE
 

diff --git a/wmls2pbc.pir b/wmls2pbc.pir
@@ -21,7 +21,7 @@ wmlsd, wmls2pir, wmlsi
 
 .sub 'main' :main
     .param pmc argv
-    load_bytecode 'library/WMLScript.pbc'
+    load_language 'wmlscript'
     .local int argc
     .local string progname
     .local string filename

diff --git a/wmls2pir.pir b/wmls2pir.pir
@@ -21,7 +21,7 @@ wmlsd, wmls2pbc, wmlsi
 
 .sub 'main' :main
     .param pmc argv
-    load_bytecode 'library/WMLScript.pbc'
+    load_language 'wmlscript'
     .local int argc
     .local string progname
     .local string filename

diff --git a/wmlscript/.gitignore b/wmlscript/.gitignore
@@ -0,0 +1,2 @@
+
+*.pbc
diff --git a/wmlsd.pir b/wmlsd.pir
@@ -21,7 +21,7 @@ parrot-wmlsi
 
 .sub 'main' :main
     .param pmc argv
-    load_bytecode 'library/WMLScript.pbc'
+    load_language 'wmlscript'
     .local int argc
     .local string progname
     .local string filename

diff --git a/wmlsi.pir b/wmlsi.pir
@@ -22,7 +22,7 @@ parrot-wmlsd
 
 .sub 'main' :main
     .param pmc argv
-    load_bytecode 'library/WMLScript.pbc'
+    load_language 'wmlscript'
     .local int argc
     .local string progname
     .local string filename