diff options
| author | dos-reis <gdr@axiomatics.org> | 2009-09-26 13:49:18 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2009-09-26 13:49:18 +0000 |
| commit | 91bd7571dc0baf8d17047d553e4616dd587c0ffb (patch) | |
| tree | 2e2a2eb23ff2cb76b6eb3ae763a480ac1f0078ad /src/interp/fortcall.boot | |
| parent | 868f1d56a5bcd7d712855e98085e0e15d32a3264 (diff) | |
| download | open-axiom-91bd7571dc0baf8d17047d553e4616dd587c0ffb.tar.gz | |
* interp/: More cleanup.
Diffstat (limited to 'src/interp/fortcall.boot')
| -rw-r--r-- | src/interp/fortcall.boot | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/interp/fortcall.boot b/src/interp/fortcall.boot index edd5972b..efae972d 100644 --- a/src/interp/fortcall.boot +++ b/src/interp/fortcall.boot @@ -331,7 +331,7 @@ makeSpadFun(name,userArgs,args,dummies,decls,results,returnType,asps,aspInfo, [["$elt","Result","construct"],body]] stripNil u == - [CAR(u), ["construct",:second(u)], if third(u) then "true" else "false"] + [first(u), ["construct",:second(u)], if third(u) then "true" else "false"] makeUnion aspType == -- The argument is the type of the asp to be generated. We would like to @@ -595,11 +595,11 @@ prepareResults(results,args,dummies,values,decls) == -- -- Take a vector of vectors and return a single vector which is in column -- -- order (i.e. swap from C to Fortran order). -- els := nil --- rows := CAR ARRAY_-DIMENSIONS(u)-1 --- cols := CAR ARRAY_-DIMENSIONS(ELT(u,0))-1 +-- rows := first ARRAY_-DIMENSIONS(u)-1 +-- cols := first ARRAY_-DIMENSIONS(ELT(u,0))-1 -- -- Could be a 3D Matrix -- if VECTORP ELT(ELT(u,0),0) then --- planes := CAR ARRAY_-DIMENSIONS(ELT(ELT(u,0),0))-1 +-- planes := first ARRAY_-DIMENSIONS(ELT(ELT(u,0),0))-1 -- for k in 0..planes repeat for j in 0..cols repeat for i in 0..rows repeat -- els := [ELT(ELT(ELT(u,i),j),k),:els] -- else @@ -626,13 +626,13 @@ writeData(tmpFile,indata) == xdrWrite(xstr,v) -- some array VECTORP v => - rows := CAR ARRAY_-DIMENSIONS(v) + rows := first ARRAY_-DIMENSIONS(v) -- is it 2d or more (most likely) ? VECTORP ELT(v,0) => - cols := CAR ARRAY_-DIMENSIONS(ELT(v,0)) + cols := first ARRAY_-DIMENSIONS(ELT(v,0)) -- is it 3d ? VECTORP ELT(ELT(v,0),0) => - planes := CAR ARRAY_-DIMENSIONS(ELT(ELT(v,0),0)) + planes := first ARRAY_-DIMENSIONS(ELT(ELT(v,0),0)) -- write 3d array xdrWrite(xstr,rows*cols*planes) for k in 0..planes-1 repeat |