Replace 2 trivial PIR files with one liners in NQP.

partcl · Apr 5, 2010 · 6a4abcd · 6a4abcd
1 parent 16f0b3d
commit 6a4abcd
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 43 deletions.
diff --git a/build/Makefile.in b/build/Makefile.in
@@ -43,14 +43,10 @@ GEN_SOURCES = \
   src/init.pir \
   src/options.pir
 
-SOURCES = \
-    src/class/tclstring.pir \
-    src/class/tcllist.pir
-
 $(PARTCL_EXE) : partcl.pbc
 	$(PBC_TO_EXE) partcl.pbc
 
-partcl.pbc : src/Partcl.pir $(SOURCES) $(GEN_SOURCES)
+partcl.pbc : src/Partcl.pir $(GEN_SOURCES)
 	$(PARROT) -o $@ $<
 
 .SUFFIXES: .pm .pir

diff --git a/src/Partcl.pir b/src/Partcl.pir
@@ -1,6 +1,3 @@
-.include 'src/class/tcllist.pir'
-.include 'src/class/tclstring.pir'
-
 .HLL 'tcl'
 
 .namespace []

diff --git a/src/TclList.pm b/src/TclList.pm
@@ -1,10 +1,10 @@
-# This class is currently created via PIR in src/class/tcllist.pir
-
 INIT {
+    pir::subclass__ps(pir::get_class__ps('ResizablePMCArray'), 'TclList');
+
     my $interp := pir::getinterp__p();
     my $tcl  := pir::get_class__ps('TclList'),
-
     my $core := pir::get_class__ps('ResizablePMCArray'),
+
     $interp.hll_map($core, $tcl);
 
     $core := pir::get_class__ps('ResizableStringArray'),

diff --git a/src/TclString.pm b/src/TclString.pm
@@ -1,6 +1,6 @@
-# This class is currently created via PIR in src/class/tclstring.pir
-
 INIT {
+    pir::subclass__ps(pir::get_class__ps('String'), 'TclString');
+
     my $tcl  := pir::get_class__ps('TclString');
     my $core := pir::get_class__ps('String');
     pir::getinterp__p().hll_map($core, $tcl);

diff --git a/src/class/tcllist.pir b/src/class/tcllist.pir
diff --git a/src/class/tclstring.pir b/src/class/tclstring.pir