From ef3e16960ee4d9d1c02c1f63a7f8125a489d1373 Mon Sep 17 00:00:00 2001 From: dos-reis Date: Sun, 13 Jan 2008 23:42:24 +0000 Subject: Fix SF/1852076 * algebra/domain.spad (reify$Domain): Specify target type of conversion. * interp/nrunfast.boot (newLookupInDomain): Tidy. (newLookupInCategories): Likewise. * testsuite/interpreter/1852076.input: New. --- src/ChangeLog | 13 +++++++++++-- src/algebra/domain.spad | 2 +- src/interp/nrunfast.boot | 4 ++-- src/testsuite/interpreter/1852076.input | 3 +++ 4 files changed, 17 insertions(+), 5 deletions(-) create mode 100644 src/testsuite/interpreter/1852076.input (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index 76d32f49..03a128f7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,12 @@ +2008-01-13 Gabriel Dos Reis + + Fix SF/1852076 + * algebra/domain.spad (reify$Domain): Specify target type of + conversion. + * interp/nrunfast.boot (newLookupInDomain): Tidy. + (newLookupInCategories): Likewise. + * testsuite/interpreter/1852076.input: New. + 2008-01-13 Gabriel Dos Reis Fix SF/1867459 @@ -8,7 +17,7 @@ 2008-01-13 Ralf Hemmecke Gabriel Dos Reis - * algebra/bags.spad.pamphlet (Stack$map!): Cache the result in the + * algebra/bags.spad.pamphlet (map!$Stack): Cache the result in the underlying reference. 2008-01-11 Gabriel Dos Reis @@ -18,7 +27,7 @@ 2008-01-10 Gabriel Dos Reis * algebra/syntax.spad (getOperator): Inject into the right - Union branhc. + Union branch. 2008-01-08 Gabriel Dos Reis diff --git a/src/algebra/domain.spad b/src/algebra/domain.spad index f9b21be5..6d30ab18 100644 --- a/src/algebra/domain.spad +++ b/src/algebra/domain.spad @@ -51,7 +51,7 @@ Domain(): Public == Private where outputDomainConstructor(x)$Lisp reify x == - convert(devaluate(x)$Lisp)$Syntax + convert(devaluate(x)$Lisp@SExpression)$Syntax showSummary x == showSummary(x)$Lisp diff --git a/src/interp/nrunfast.boot b/src/interp/nrunfast.boot index 6a6c3ed4..663ed874 100644 --- a/src/interp/nrunfast.boot +++ b/src/interp/nrunfast.boot @@ -225,7 +225,7 @@ newLookupInDomain(op,sig,addFormDomain,dollar,index) == INTEGERP KAR addFormCell => or/[newLookupInDomain(op,sig,addFormDomain,dollar,i) for i in addFormCell] if null VECP addFormCell then lazyDomainSet(addFormCell,addFormDomain,index) - lookupInDomainAndDefaults(op,sig,addFormDomain.index,dollar,false) + lookupInDomainVector(op,sig,addFormDomain.index,dollar) nil --======================================================= @@ -371,7 +371,7 @@ newLookupInCategories1(op,sig,dom,dollar) == null package => nil if $monitorNewWorld then sayLooking1('"Looking at instantiated package ",package) - res := lookupInDomainAndDefaults(op,sig,package,dollar,false) => + res := lookupInDomainVector(op,sig,package,dollar) => if $monitorNewWorld = true then sayBrightly '"candidate default package succeeds" return res diff --git a/src/testsuite/interpreter/1852076.input b/src/testsuite/interpreter/1852076.input new file mode 100644 index 00000000..41474b58 --- /dev/null +++ b/src/testsuite/interpreter/1852076.input @@ -0,0 +1,3 @@ +++ Contributed by Luke Wagner +-- Exposed a `missing function' bug. +sqrt 2 -- cgit v1.2.3