[svn:parrot] r34960 - in branches/pct_hll/languages/cardinal: . src/classes src/parser

Author: tene
Date: Sun Jan  4 22:08:51 2009
New Revision: 34960

Modified:
   branches/pct_hll/languages/cardinal/cardinal.pir
   branches/pct_hll/languages/cardinal/src/classes/Array.pir
   branches/pct_hll/languages/cardinal/src/classes/Bool.pir
   branches/pct_hll/languages/cardinal/src/classes/Continuation.pir
   branches/pct_hll/languages/cardinal/src/classes/Failure.pir
   branches/pct_hll/languages/cardinal/src/classes/File.pir
   branches/pct_hll/languages/cardinal/src/classes/Hash.pir
   branches/pct_hll/languages/cardinal/src/classes/Integer.pir
   branches/pct_hll/languages/cardinal/src/classes/Kernel.pir
   branches/pct_hll/languages/cardinal/src/classes/NilClass.pir
   branches/pct_hll/languages/cardinal/src/classes/Object.pir
   branches/pct_hll/languages/cardinal/src/classes/Queue.pir
   branches/pct_hll/languages/cardinal/src/classes/String.pir
   branches/pct_hll/languages/cardinal/src/parser/actions.pm

Log:
[cardinal]: Use the 'cardinal' HLL namespace.

Modified: branches/pct_hll/languages/cardinal/cardinal.pir
==============================================================================
--- branches/pct_hll/languages/cardinal/cardinal.pir	(original)
+++ branches/pct_hll/languages/cardinal/cardinal.pir	Sun Jan  4 22:08:51 2009
@@ -22,21 +22,29 @@
 =cut
 
 
+.HLL 'cardinal'
 .namespace []
 
 .include 'src/gen_builtins.pir'
 
 .sub 'onload' :anon :load :init
-    $P0 = subclass 'ResizablePMCArray', 'List'
+    load_bytecode 'PCT.pbc'
+    .local pmc parrotns, cardinalns, exports
+    parrotns = get_root_namespace ['parrot']
+    cardinalns = get_hll_namespace
+    exports = split ' ', 'PAST PCT PGE P6metaclass'
+    parrotns.'export_to'(cardinalns, exports)
 .end
 
+.include 'src/gen_grammar.pir'
+.include 'src/parser/quote_expression.pir'
+.include 'src/gen_actions.pir'
 .namespace [ 'cardinal';'Compiler' ]
 
 #no caridinal_group found on my machine
 #.loadlib 'cardinal_group'
 
 .sub 'onload' :anon :load :init
-    load_bytecode 'PCT.pbc'
     .local pmc cardinalmeta
     cardinalmeta = get_hll_global ['CardinalObject'], '!CARDINALMETA'
     cardinalmeta.'new_class'('cardinal::Compiler', 'parent'=>'PCT::HLLCompiler')
@@ -44,17 +52,19 @@
     $P0 = get_hll_global ['PCT'], 'HLLCompiler'
     $P1 = $P0.'new'()
     $P1.'language'('cardinal')
-    $P1.'parsegrammar'('cardinal::Grammar')
-    $P1.'parseactions'('cardinal::Grammar::Actions')
+    $P0 = get_hll_namespace ['cardinal';'Grammar']
+    $P1.'parsegrammar'($P0)
+    $P0 = get_hll_namespace ['cardinal';'Grammar';'Actions']
+    $P1.'parseactions'($P0)
 
     $P1.'commandline_banner'("Cardinal - Ruby for the Parrot VM\n\n")
     $P1.'commandline_prompt'('crb(main):001:0>')
 
      ##  create a list of END blocks to be run
-    $P0 = new 'List'
+    $P0 = new 'CardinalArray'
     set_hll_global ['cardinal'], '@?END_BLOCKS', $P0
 
-    $P0 = new 'List'
+    $P0 = new 'CardinalArray'
     set_hll_global ['cardinal';'Grammar';'Actions'], '@?BLOCK', $P0
 
     $P1 = get_hll_global ['PAST';'Compiler'], '%valflags'
@@ -99,13 +109,6 @@
   iter_end:
 .end
 
-
-.include 'src/gen_grammar.pir'
-.include 'src/parser/quote_expression.pir'
-.include 'src/gen_actions.pir'
-
-
-
 =back
 
 =cut

Modified: branches/pct_hll/languages/cardinal/src/classes/Array.pir
==============================================================================
--- branches/pct_hll/languages/cardinal/src/classes/Array.pir	(original)
+++ branches/pct_hll/languages/cardinal/src/classes/Array.pir	Sun Jan  4 22:08:51 2009
@@ -16,8 +16,8 @@
 .sub 'onload' :anon :load :init
     .local pmc cardinalmeta, arrayproto, interp, core_type, hll_type
     cardinalmeta = get_hll_global ['CardinalObject'], '!CARDINALMETA'
-    arrayproto = cardinalmeta.'new_class'('CardinalArray', 'parent'=>'ResizablePMCArray CardinalObject')
-    cardinalmeta.'register'('ResizablePMCArray', 'parent'=>'CardinalObject', 'protoobject'=>arrayproto)
+    arrayproto = cardinalmeta.'new_class'('CardinalArray', 'parent'=>'parrot;ResizablePMCArray CardinalObject')
+    #cardinalmeta.'register'('ResizablePMCArray', 'parent'=>'CardinalObject', 'protoobject'=>arrayproto)
     core_type = get_class 'ResizablePMCArray'
     hll_type = get_class 'CardinalArray'
 

Modified: branches/pct_hll/languages/cardinal/src/classes/Bool.pir
==============================================================================
--- branches/pct_hll/languages/cardinal/src/classes/Bool.pir	(original)
+++ branches/pct_hll/languages/cardinal/src/classes/Bool.pir	Sun Jan  4 22:08:51 2009
@@ -17,7 +17,7 @@
 .sub 'onload' :anon :init :load
     .local pmc cardinalmeta, boolproto
     cardinalmeta = get_hll_global ['CardinalObject'], '!CARDINALMETA'
-    boolproto = cardinalmeta.'new_class'('Bool', 'parent'=>'Boolean')
+    boolproto = cardinalmeta.'new_class'('Bool', 'parent'=>'parrot;Boolean')
     cardinalmeta.'register'('Boolean', 'parent'=>boolproto, 'protoobject'=>boolproto)
 
     $P0 = boolproto.'new'()

Modified: branches/pct_hll/languages/cardinal/src/classes/Continuation.pir
==============================================================================
--- branches/pct_hll/languages/cardinal/src/classes/Continuation.pir	(original)
+++ branches/pct_hll/languages/cardinal/src/classes/Continuation.pir	Sun Jan  4 22:08:51 2009
@@ -22,7 +22,7 @@
 .sub 'onload' :anon :init :load
     .local pmc cardinalmeta, contproto
     cardinalmeta = get_hll_global ['CardinalObject'], '!CARDINALMETA'
-    contproto = cardinalmeta.'new_class'('CardinalContinuation', 'parent'=>'Continuation CardinalObject')
+    contproto = cardinalmeta.'new_class'('CardinalContinuation', 'parent'=>'parrot;Continuation CardinalObject')
     cardinalmeta.'register'('Continuation', 'parent'=>'CardinalObject', 'protoobject'=>contproto)
 
 .end

Modified: branches/pct_hll/languages/cardinal/src/classes/Failure.pir
==============================================================================
--- branches/pct_hll/languages/cardinal/src/classes/Failure.pir	(original)
+++ branches/pct_hll/languages/cardinal/src/classes/Failure.pir	Sun Jan  4 22:08:51 2009
@@ -3,7 +3,7 @@
 .sub 'onload' :anon :init :load
     .local pmc meta, failureproto, exceptionproto
     meta = get_hll_global ['CardinalObject'], '!CARDINALMETA'
-    failureproto = meta.'new_class'('CardinalFailure', 'parent'=>'Undef CardinalAny', 'attr'=>'$!exception')
+    failureproto = meta.'new_class'('CardinalFailure', 'parent'=>'parrot;Undef CardinalAny', 'attr'=>'$!exception')
     meta.'register'('Undef', 'parent'=>failureproto, 'protoobject'=>failureproto)
     exceptionproto = meta.'new_class'('CardinalException', 'parent'=>'CardinalAny', 'attr'=>'$!exception')
     meta.'register'('Exception', 'protoobject'=>exceptionproto)

Modified: branches/pct_hll/languages/cardinal/src/classes/File.pir
==============================================================================
--- branches/pct_hll/languages/cardinal/src/classes/File.pir	(original)
+++ branches/pct_hll/languages/cardinal/src/classes/File.pir	Sun Jan  4 22:08:51 2009
@@ -22,7 +22,7 @@
 .sub 'onload' :anon :init :load
     .local pmc cardinalmeta
     $P0 = get_hll_global ['CardinalObject'], '!CARDINALMETA'
-    cardinalmeta = $P0.'new_class'('CardinalFile', 'parent'=>'File IO CardinalObject', 'attr'=>'!path')
+    cardinalmeta = $P0.'new_class'('CardinalFile', 'parent'=>'parrot;File IO CardinalObject', 'attr'=>'!path')
     $P0.'register'('File', 'parent'=>'CardinalObject', 'protoobject'=>cardinalmeta)
 .end
 

Modified: branches/pct_hll/languages/cardinal/src/classes/Hash.pir
==============================================================================
--- branches/pct_hll/languages/cardinal/src/classes/Hash.pir	(original)
+++ branches/pct_hll/languages/cardinal/src/classes/Hash.pir	Sun Jan  4 22:08:51 2009
@@ -15,7 +15,7 @@
 .sub 'onload' :anon :load :init
     .local pmc cardinalmeta, mappingproto
     cardinalmeta = get_hll_global ['CardinalObject'], '!CARDINALMETA'
-    mappingproto = cardinalmeta.'new_class'('CardinalHash', 'parent'=>'Hash CardinalObject')
+    mappingproto = cardinalmeta.'new_class'('CardinalHash', 'parent'=>'parrot;Hash CardinalObject')
     cardinalmeta.'register'('Hash', 'parent'=>'CardinalObject', 'protoobject'=>mappingproto)
     $P0 = get_class 'CardinalHash'
     addattribute $P0, 'default'
@@ -76,7 +76,7 @@
     .local pmc iter
     .local pmc rv
     iter = new 'Iterator', self
-    rv   = new 'List'
+    rv   = new 'CardinalArray'
   loop:
     unless iter goto end
     $S1 = shift iter
@@ -94,7 +94,7 @@
     .local pmc iter
     .local pmc rv
     iter = new 'Iterator', self
-    rv   = new 'List'
+    rv   = new 'CardinalArray'
   loop:
     unless iter goto end
     $S1 = shift iter
@@ -109,7 +109,7 @@
     .local pmc iter
     .local pmc rv
     iter = new 'Iterator', self
-    rv   = new 'List'
+    rv   = new 'CardinalArray'
   loop:
     unless iter goto end
     $S1 = shift iter

Modified: branches/pct_hll/languages/cardinal/src/classes/Integer.pir
==============================================================================
--- branches/pct_hll/languages/cardinal/src/classes/Integer.pir	(original)
+++ branches/pct_hll/languages/cardinal/src/classes/Integer.pir	Sun Jan  4 22:08:51 2009
@@ -20,7 +20,7 @@
 .sub 'onload' :anon :init :load
     .local pmc cardinalmeta, intproto
     cardinalmeta = get_hll_global ['CardinalObject'], '!CARDINALMETA'
-    intproto = cardinalmeta.'new_class'('CardinalInteger', 'parent'=>'Integer CardinalObject')
+    intproto = cardinalmeta.'new_class'('CardinalInteger', 'parent'=>'parrot;Integer CardinalObject')
     cardinalmeta.'register'('Float', 'parent'=>'CardinalObject', 'protoobject'=>intproto)
 .end
 

Modified: branches/pct_hll/languages/cardinal/src/classes/Kernel.pir
==============================================================================
--- branches/pct_hll/languages/cardinal/src/classes/Kernel.pir	(original)
+++ branches/pct_hll/languages/cardinal/src/classes/Kernel.pir	Sun Jan  4 22:08:51 2009
@@ -21,7 +21,7 @@
 .sub 'onload' :anon :init :load
     .local pmc cardinalmeta, kernelprototype
     load_bytecode 'P6object.pbc'
-    $P0 = get_hll_global 'P6metaclass'
+    $P0 = get_hll_global ['CardinalObject'], '!CARDINALMETA'
     kernelprototype = $P0.'new_class'('Kernel', 'attr'=>'%!properties')
     #cardinalmeta = $P0.'HOW'()
     cardinalmeta = kernelprototype.'new'()

Modified: branches/pct_hll/languages/cardinal/src/classes/NilClass.pir
==============================================================================
--- branches/pct_hll/languages/cardinal/src/classes/NilClass.pir	(original)
+++ branches/pct_hll/languages/cardinal/src/classes/NilClass.pir	Sun Jan  4 22:08:51 2009
@@ -5,7 +5,7 @@
 .sub 'onload' :anon :load :init
     .local pmc cardinalmeta, nilproto
     cardinalmeta = get_hll_global ['CardinalObject'], '!CARDINALMETA'
-    nilproto = cardinalmeta.'new_class'('NilClass', 'parent'=>'Undef CardinalObject')
+    nilproto = cardinalmeta.'new_class'('NilClass', 'parent'=>'parrot;Undef CardinalObject')
     cardinalmeta.'register'('Undef', 'parent'=>nilproto, 'protoobject'=>nilproto)
 .end
 

Modified: branches/pct_hll/languages/cardinal/src/classes/Object.pir
==============================================================================
--- branches/pct_hll/languages/cardinal/src/classes/Object.pir	(original)
+++ branches/pct_hll/languages/cardinal/src/classes/Object.pir	Sun Jan  4 22:08:51 2009
@@ -29,7 +29,7 @@
 .sub 'onload' :anon :init :load
     .local pmc cardinalmeta
     load_bytecode 'P6object.pbc'
-    $P0 = get_hll_global 'P6metaclass'
+    $P0 = get_root_global ['parrot'], 'P6metaclass'
     $P0.'new_class'('CardinalObject', 'attr'=>'%!properties')
     cardinalmeta = $P0.'HOW'()
     set_hll_global ['CardinalObject'], '!CARDINALMETA', cardinalmeta

Modified: branches/pct_hll/languages/cardinal/src/classes/Queue.pir
==============================================================================
--- branches/pct_hll/languages/cardinal/src/classes/Queue.pir	(original)
+++ branches/pct_hll/languages/cardinal/src/classes/Queue.pir	Sun Jan  4 22:08:51 2009
@@ -22,7 +22,7 @@
 .sub 'onload' :anon :init :load
     .local pmc meta, qproto
     meta = get_hll_global ['CardinalObject'], '!CARDINALMETA'
-    qproto = meta.'new_class'('Queue', 'parent'=>'TQueue CardinalObject', 'attr'=>'')
+    qproto = meta.'new_class'('Queue', 'parent'=>'parrot;TQueue CardinalObject', 'attr'=>'')
     meta.'register'('TQueue', 'parent'=>'TQueue', 'protoobject'=>qproto)
 .end
 

Modified: branches/pct_hll/languages/cardinal/src/classes/String.pir
==============================================================================
--- branches/pct_hll/languages/cardinal/src/classes/String.pir	(original)
+++ branches/pct_hll/languages/cardinal/src/classes/String.pir	Sun Jan  4 22:08:51 2009
@@ -23,7 +23,7 @@
 .sub 'onload' :anon :init :load
     .local pmc cardinalmeta, strproto
     cardinalmeta = get_hll_global ['CardinalObject'], '!CARDINALMETA'
-    strproto = cardinalmeta.'new_class'('CardinalString', 'parent'=>'String CardinalObject')
+    strproto = cardinalmeta.'new_class'('CardinalString', 'parent'=>'parrot;String CardinalObject')
     cardinalmeta.'register'('String', 'parent'=>'CardinalObject', 'protoobject'=>strproto)
 .end
 

Modified: branches/pct_hll/languages/cardinal/src/parser/actions.pm
==============================================================================
--- branches/pct_hll/languages/cardinal/src/parser/actions.pm	(original)
+++ branches/pct_hll/languages/cardinal/src/parser/actions.pm	Sun Jan  4 22:08:51 2009
@@ -21,6 +21,7 @@
     my $past := $( $<comp_stmt> );
     $past.blocktype('declaration');
     $past.pirflags(':load');
+    $past.hll('cardinal');
 
     our $?INIT;
         if defined( $?INIT ) {

• [svn:parrot] r34960 - in branches/pct_hll/languages/cardinal: . src/classes src/parser by tene