Skip to content

Commit

Permalink
a few small cleanups
Browse files Browse the repository at this point in the history
  • Loading branch information
Whiteknight committed Aug 23, 2010
1 parent c20761a commit b530931
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 13 deletions.
6 changes: 4 additions & 2 deletions src/include/pla_matrix_library.h
Expand Up @@ -2,9 +2,11 @@
#define _PLA_MATRIX_LIBRARY_H_

INTVAL floats_are_equal(FLOATVAL a, FLOATVAL b);
void get_complex_value_from_pmc(PARROT_INTERP, PMC * value, FLOATVAL * real, FLOATVAL * imag);
void get_complex_value_from_pmc(PARROT_INTERP, PMC * value, FLOATVAL * real,
FLOATVAL * imag);

void intkey_to_coords(PARROT_INTERP, const INTVAL rows, const INTVAL cols, const INTVAL key, INTVAL * row, INTVAL * col);
void intkey_to_coords(PARROT_INTERP, const INTVAL rows, const INTVAL cols,
const INTVAL key, INTVAL * row, INTVAL * col);


#endif /* _PLA_MATRIX_LIBRARY_H */
19 changes: 13 additions & 6 deletions src/pmc/complexmatrix2d.pmc
Expand Up @@ -102,7 +102,9 @@ resize_matrix(PARROT_INTERP, PMC * self, INTVAL row, INTVAL col)
}

static void
init_from_pmc_array(PARROT_INTERP, PMC * self, INTVAL rows_size, INTVAL cols_size, PMC * values) {
init_from_pmc_array(PARROT_INTERP, PMC * self, INTVAL rows_size,
INTVAL cols_size, PMC * values)
{
DECLATTRS(self, attrs);
INTVAL num = 0;
const INTVAL init_elems = VTABLE_elements(interp, values);
Expand Down Expand Up @@ -138,7 +140,8 @@ get_complex_pmc_at_xy(PARROT_INTERP, PMC *self, INTVAL rows, INTVAL cols)
}

static void
set_complex_pmc_at_xy(PARROT_INTERP, PMC * self, PMC * value, INTVAL row, INTVAL col)
set_complex_pmc_at_xy(PARROT_INTERP, PMC * self, PMC * value, INTVAL row,
INTVAL col)
{
DECLATTRS(self, attrs);
INTVAL rows_size = attrs->rows;
Expand All @@ -159,7 +162,8 @@ set_complex_pmc_at_xy(PARROT_INTERP, PMC * self, PMC * value, INTVAL row, INTVAL
}

static void
set_scalar_at_xy(PARROT_INTERP, PMC * self, FLOATVAL value, INTVAL row, INTVAL col)
set_scalar_at_xy(PARROT_INTERP, PMC * self, FLOATVAL value, INTVAL row,
INTVAL col)
{
DECLATTRS(self, attrs);
INTVAL rows_size = attrs->rows;
Expand Down Expand Up @@ -1215,15 +1219,18 @@ value with the return value of the called function.
RETURN(PMC * new_matrix);
}

METHOD initialize_from_array(INTVAL rows_size, INTVAL cols_size, PMC *values) {
METHOD initialize_from_array(INTVAL rows_size, INTVAL cols_size,
PMC *values) {
init_from_pmc_array(INTERP, SELF, rows_size, cols_size, values);
}

METHOD initialize_from_args(INTVAL rows_size, INTVAL cols_size, PMC *values :slurpy) {
METHOD initialize_from_args(INTVAL rows_size, INTVAL cols_size,
PMC *values :slurpy) {
init_from_pmc_array(INTERP, SELF, rows_size, cols_size, values);
}

METHOD get_block(INTVAL rows_idx, INTVAL cols_idx, INTVAL rows_size, INTVAL cols_size) {
METHOD get_block(INTVAL rows_idx, INTVAL cols_idx, INTVAL rows_size,
INTVAL cols_size) {
DECLATTRS(SELF, attrs);
FLOATVAL * const s = attrs->storage;
const INTVAL rows = attrs->rows;
Expand Down
9 changes: 6 additions & 3 deletions src/pmc/nummatrix2d.pmc
Expand Up @@ -1092,11 +1092,13 @@ with data in order.

*/

METHOD initialize_from_array(INTVAL rows_size, INTVAL cols_size, PMC *values) {
METHOD initialize_from_array(INTVAL rows_size, INTVAL cols_size,
PMC *values) {
init_from_pmc_array(INTERP, SELF, rows_size, cols_size, values);
}

METHOD initialize_from_args(INTVAL rows_size, INTVAL cols_size, PMC *values :slurpy) {
METHOD initialize_from_args(INTVAL rows_size, INTVAL cols_size,
PMC *values :slurpy) {
init_from_pmc_array(INTERP, SELF, rows_size, cols_size, values);
}

Expand All @@ -1110,7 +1112,8 @@ with data in order.

*/

METHOD get_block(INTVAL rows_idx, INTVAL cols_idx, INTVAL rows_size, INTVAL cols_size) {
METHOD get_block(INTVAL rows_idx, INTVAL cols_idx, INTVAL rows_size,
INTVAL cols_size) {
DECLATTRS(SELF, attrs);
FLOATVAL * const s = attrs->storage;
const INTVAL rows = attrs->rows;
Expand Down
7 changes: 5 additions & 2 deletions src/pmc/pmcmatrix2d.pmc
Expand Up @@ -56,7 +56,9 @@ resize_matrix(PARROT_INTERP, PMC * self, INTVAL row, INTVAL col)
}

static void
init_from_pmc_array(PARROT_INTERP, PMC * self, INTVAL rows_size, INTVAL cols_size, PMC * values) {
init_from_pmc_array(PARROT_INTERP, PMC * self, INTVAL rows_size,
INTVAL cols_size, PMC * values)
{
DECLATTRS(self, attrs);
PMC ** s;
INTVAL self_rows, self_cols, i, j, num = 0;
Expand Down Expand Up @@ -632,7 +634,8 @@ value with the return value of the called function.
RETURN(PMC * new_matrix);
}

METHOD get_block(INTVAL rows_idx, INTVAL cols_idx, INTVAL rows_size, INTVAL cols_size) {
METHOD get_block(INTVAL rows_idx, INTVAL cols_idx, INTVAL rows_size,
INTVAL cols_size) {
DECLATTRS(SELF, attrs);
PMC ** const s = attrs->storage;
const INTVAL rows = attrs->rows;
Expand Down

0 comments on commit b530931

Please sign in to comment.