Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

fix Matrixy so it works with NQP-RX.

  • Loading branch information...
commit 99510312aacce7e9c0083ddbd8d74b60c5838b34 1 parent ce63abc
@Whiteknight authored
Showing with 7 additions and 2 deletions.
  1. +6 −2 Configure.nqp
  2. +1 −0  src/internals/aggregates.pir
View
8 Configure.nqp
@@ -15,7 +15,8 @@ sub MAIN () {
say("to figure out how to build matrixy.\n");
# Load Parrot config and glue functions
- load_bytecode('config/config-helpers.pir');
+ pir::load_bytecode("PGE.pbc");
+ pir::load_bytecode('config/config-helpers.pir');
# Check for linalg_group
Q:PIR {
@@ -26,13 +27,15 @@ sub MAIN () {
linalg_group_loaded:
push_eh cannot_load_library
$P0 = new ['NumMatrix2D']
+ pop_eh
goto everything_is_fine
cannot_load_library:
+ pop_eh
say "linalg_group not found"
say "You must install the parrot-linear-algebra package before"
say "installing Matrixy."
say "http://www.github.com/Whiteknight/parrot-linear-algebra"
- exit 1
+ .return()
everything_is_fine:
say "linalg_group loaded OK"
};
@@ -45,6 +48,7 @@ sub MAIN () {
# Fix paths on Windows
if ($OS eq 'MSWin32') {
+ say("D");
$replaced := subst($replaced, rx('/'), '\\');
}
View
1  src/internals/aggregates.pir
@@ -64,6 +64,7 @@
.local pmc cell
.local pmc row
.local int length
+ .local pmc myiter
cell = new ['PMCMatrix2D']
$I0 = rows
if $I0 == 0 goto new_empty_cell
Please sign in to comment.
Something went wrong with that request. Please try again.