Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

fix Matrixy so it works with NQP-RX.

  • Loading branch information...
commit 99510312aacce7e9c0083ddbd8d74b60c5838b34 1 parent ce63abc
Andrew Whitworth authored November 17, 2009
8  Configure.nqp
@@ -15,7 +15,8 @@ sub MAIN () {
15 15
     say("to figure out how to build matrixy.\n");
16 16
 
17 17
     # Load Parrot config and glue functions
18  
-    load_bytecode('config/config-helpers.pir');
  18
+    pir::load_bytecode("PGE.pbc");
  19
+    pir::load_bytecode('config/config-helpers.pir');
19 20
 
20 21
     # Check for linalg_group
21 22
     Q:PIR {
@@ -26,13 +27,15 @@ sub MAIN () {
26 27
       linalg_group_loaded:
27 28
         push_eh cannot_load_library
28 29
         $P0 = new ['NumMatrix2D']
  30
+        pop_eh
29 31
         goto everything_is_fine
30 32
       cannot_load_library:
  33
+        pop_eh
31 34
         say "linalg_group not found"
32 35
         say "You must install the parrot-linear-algebra package before"
33 36
         say "installing Matrixy."
34 37
         say "http://www.github.com/Whiteknight/parrot-linear-algebra"
35  
-        exit 1
  38
+        .return()
36 39
       everything_is_fine:
37 40
         say "linalg_group loaded OK"
38 41
     };
@@ -45,6 +48,7 @@ sub MAIN () {
45 48
 
46 49
     # Fix paths on Windows
47 50
     if ($OS eq 'MSWin32') {
  51
+        say("D");
48 52
         $replaced := subst($replaced, rx('/'), '\\');
49 53
     }
50 54
 
1  src/internals/aggregates.pir
@@ -64,6 +64,7 @@
64 64
     .local pmc cell
65 65
     .local pmc row
66 66
     .local int length
  67
+    .local pmc myiter
67 68
     cell = new ['PMCMatrix2D']
68 69
     $I0 = rows
69 70
     if $I0 == 0 goto new_empty_cell

0 notes on commit 9951031

Please sign in to comment.
Something went wrong with that request. Please try again.