move helper functions out of the matrixy.pir driver file and into src…

…/internals/*
Whiteknight · Oct 21, 2009 · 264840d · 264840d
1 parent 9821908
commit 264840d
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 32 deletions.
diff --git a/matrixy.pir b/matrixy.pir
@@ -89,38 +89,6 @@ to the Matrixy compiler.
 .include 'src/gen_grammar.pir'
 .include 'src/gen_actions.pir'
 
-.namespace []
-
-.sub '!hash'
-    .param pmc fields :slurpy :named
-    .return (fields)
-.end
-
-.sub '_new_empty_array'
-    $P0 = new 'ResizablePMCArray'
-    .return($P0)
-.end
-
-# TODO: Move this to somewhere in src/internals/*
-.sub '_terminator_has_semicolon'
-    .param string term
-    $S0 = substr term, 0, 1
-    if $S0 == ';' goto has_semicolon
-    .return(0)
-  has_semicolon:
-    .return(1)
-.end
-
-.sub '!get_first_array_row'
-    .param pmc m
-    $S0 = typeof m
-    if $S0 == 'ResizablePMCArray' goto have_matrix
-    .return(m)
-  have_matrix:
-    $P0 = m[0]
-    .return($P0)
-.end
-
 =back
 
 =cut

diff --git a/src/internals/aggregates.pir b/src/internals/aggregates.pir
@@ -0,0 +1,12 @@
+
+.namespace []
+
+.sub '!hash'
+.param pmc fields :slurpy :named
+.return (fields)
+.end
+
+.sub '_new_empty_array'
+$P0 = new 'ResizablePMCArray'
+.return($P0)
+.end
diff --git a/src/internals/matrix.pir b/src/internals/matrix.pir
@@ -526,6 +526,23 @@ Can only dispatch over an internal function, not a builtin or a library routine.
     # TODO: Implement this.
 .end
 
+=item !get_first_array_row
+
+Get the first row from a matrix. If it's not a matrix/vector, just return
+the PMC itself
+
+=cut
+
+.sub '!get_first_array_row'
+    .param pmc m
+    $S0 = typeof m
+    if $S0 == 'ResizablePMCArray' goto have_matrix
+    .return(m)
+  have_matrix:
+    $P0 = m[0]
+    .return($P0)
+.end
+
 =back
 
 =cut

diff --git a/src/internals/parser.pir b/src/internals/parser.pir
@@ -0,0 +1,10 @@
+.namespace []
+
+.sub '_terminator_has_semicolon'
+    .param string term
+    $S0 = substr term, 0, 1
+    if $S0 == ';' goto has_semicolon
+    .return(0)
+  has_semicolon:
+    .return(1)
+.end