diff options
| author | dos-reis <gdr@axiomatics.org> | 2010-05-09 05:18:19 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2010-05-09 05:18:19 +0000 |
| commit | ae1c8a6b70153b86b7ff1ec972ba5f7ce7e818f6 (patch) | |
| tree | f0be83bb14b921031429fe3e37c7b5cff93d872c /src/interp/fortcall.boot | |
| parent | 114fbbb2d4a1b9aca26064d8a2fcf180c65911d2 (diff) | |
| download | open-axiom-ae1c8a6b70153b86b7ff1ec972ba5f7ce7e818f6.tar.gz | |
* interp/cattable.boot: Replace call to CONS with bracket syntax.
* interp/clammed.boot: Likewise.
* interp/cparse.boot: Likewise.
* interp/dq.boot: Likewise.
* interp/fortcall.boot: Likewise.
* interp/g-boot.boot: Likewise.
* interp/i-coerce.boot: Likewise.
* interp/i-coerfn.boot: Likewise.
* interp/i-funsel.boot: Likewise.
* interp/i-object.boot: Likewise.
* interp/i-output.boot: Likewise.
* interp/i-resolv.boot: Likewise.
* interp/i-spec1.boot: Likewise.
* interp/i-spec2.boot: Likewise.
* interp/i-syscmd.boot: Likewise.
* interp/incl.boot: Likewise.
* interp/interop.boot: Likewise.
* interp/lisplib.boot: Likewise.
* interp/msgdb.boot: Likewise.
* interp/newfort.boot: Likewise.
* interp/nruncomp.boot: Likewise.
* interp/nrunopt.boot: Likewise.
* interp/rulesets.boot: Likewise.
* interp/scan.boot: Likewise.
* interp/termrw.boot: Likewise.
* interp/wi2.boot: Likewise.
Diffstat (limited to 'src/interp/fortcall.boot')
| -rw-r--r-- | src/interp/fortcall.boot | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/interp/fortcall.boot b/src/interp/fortcall.boot index 7c4ba4e4..8eb93631 100644 --- a/src/interp/fortcall.boot +++ b/src/interp/fortcall.boot @@ -420,7 +420,7 @@ invokeFortran(objFile,args,dummies,decls,results,actual) == -- -- cons cell, otherwise a vector. This is to match the internal -- -- representation of an Axiom Record. -- #returnedValues = 1 => returnedValues --- #returnedValues = 2 => CONS(first returnedValues,SECOND returnedValues) +-- #returnedValues = 2 => [first returnedValues,:SECOND returnedValues] -- makeVector(returnedValues,nil) int2Bool u == @@ -431,7 +431,7 @@ int2Bool u == makeResultRecord(name,type,value) == -- Take an object returned by the NAG routine and make it into an AXIOM -- object of type Record(key:Symbol,entry:Any) for use by Result. - CONS(name,CONS(spadTypeTTT type,value)) + [name,:[spadTypeTTT type,:value]] spadify(l,results,decls,names,actual) == -- The elements of list l are the output forms returned from the Fortran @@ -449,20 +449,20 @@ spadify(l,results,decls,names,actual) == -- Result is a Complex Scalar ty in ["double complex" , "complex"] => spadForms := [makeResultRecord(name,ty, _ - CONS(ELT(fort,0),ELT(fort,1)) ),:spadForms] + [ELT(fort,0),:ELT(fort,1)]),:spadForms] -- Result is a Complex vector or array LISTP(ty) and first(ty) in ["double complex" , "complex"] => dims := [getVal(u,names,actual) for u in rest ty] els := nil if #dims=1 then - els := [makeVector([CONS(ELT(fort,2*i),ELT(fort,2*i+1)) _ + els := [makeVector([[ELT(fort,2*i),:ELT(fort,2*i+1)] _ for i in 0..(first(dims)-1)],nil)] else if #dims=2 then for r in 0..(first(dims) - 1) repeat innerEls := nil for c in 0..(SECOND(dims) - 1) repeat offset := 2*(c*first(dims)+r) - innerEls := [CONS(ELT(fort,offset),ELT(fort,offset+1)),:innerEls] + innerEls := [[ELT(fort,offset),:ELT(fort,offset+1)],:innerEls] els := [makeVector(nreverse innerEls,nil),:els] else error ['"Can't cope with complex output dimensions higher than 2"] |