aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2009-04-12 03:49:24 +0000
committerdos-reis <gdr@axiomatics.org>2009-04-12 03:49:24 +0000
commit865463536e19a517fecb78ddc9bfdfa4088e0b71 (patch)
treee837984ccbb6d5ca1a6e1eb7fe742f53539aba14 /src
parent2fe793e09e8508311fa2bfda4870edc288fa0495 (diff)
downloadopen-axiom-865463536e19a517fecb78ddc9bfdfa4088e0b71.tar.gz
Fix SF/2754400
* interp/setvars.boot (setOutputFortran): Transform pathname from symbol to string. * testsuite/interpreter/sf-2754400.input: New.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog7
-rw-r--r--src/interp/fortcall.boot3
-rw-r--r--src/interp/setvars.boot3
-rw-r--r--src/testsuite/interpreter/sf-2754400.input6
4 files changed, 18 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index ecae7c4f..50686acf 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,12 @@
2009-04-11 Gabriel Dos Reis <gdr@cs.tamu.edu>
+ Fix SF/2754400
+ * interp/setvars.boot (setOutputFortran): Transform pathname from
+ symbol to string.
+ * testsuite/interpreter/sf-2754400.input: New.
+
+2009-04-11 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
Fix SF/2749682
* interp/sys-os.boot ($NaNvalue): Fix typo.
* testsuite/interpreter/sf-2749682.input: New.
diff --git a/src/interp/fortcall.boot b/src/interp/fortcall.boot
index a8322d8f..78918e52 100644
--- a/src/interp/fortcall.boot
+++ b/src/interp/fortcall.boot
@@ -35,6 +35,9 @@
import sys_-macros
namespace BOOT
+--%
+$nagMessages := nil
+
makeVector(elts, t) ==
MAKE_-ARRAY(#elts, KEYWORD::ELEMENT_-TYPE, t or true,
KEYWORD::INITIAL_-CONTENTS, elts)
diff --git a/src/interp/setvars.boot b/src/interp/setvars.boot
index c131154c..6d79f999 100644
--- a/src/interp/setvars.boot
+++ b/src/interp/setvars.boot
@@ -1,6 +1,6 @@
-- Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd.
-- All rights reserved.
--- Copyright (C) 2007-2008, Gabriel Dos Reis.
+-- Copyright (C) 2007-2009, Gabriel Dos Reis.
-- All rights reserved.
--
-- Redistribution and use in source and binary forms, with or without
@@ -1193,6 +1193,7 @@ setOutputFortran arg ==
$fortranOutputFile := '"CONSOLE"
(arg is [fn,ft]) or (arg is [fn,ft,fm]) => -- aha, a file
+ fn := STRING fn
if (ptype := pathnameType fn) then
fn := STRCONC(pathnameDirectory fn,pathnameName fn)
ft := ptype
diff --git a/src/testsuite/interpreter/sf-2754400.input b/src/testsuite/interpreter/sf-2754400.input
new file mode 100644
index 00000000..bf34a20a
--- /dev/null
+++ b/src/testsuite/interpreter/sf-2754400.input
@@ -0,0 +1,6 @@
+++ Require: Nagman to succeed.
+
+-- Use to have the Lisp runtime balk at symbols uses as pathaname.
+
+answer:=c05adf(3.0,4.0,1.0e-5,0.0,-1,sin(X)::ASP1(F))
+