* interp/compiler.boot (compAtomWithModemap): Reject niladic

	functions used as constants.
	* algebra/aggcat.spad.pamphlet (IndexedAggregate): Add parenthesis
	for call to niladic function 'void'.
	* algebra/algext.spad.pamphlet (SimpleAlgebraicExtension): Likewise.
	* algebra/curve.spad.pamphlet (RadicalFunctionField): Likewise.
	(AlgebraicFunctionField): Likewise.
	* algebra/permgrps.spad.pamphlet (PermutationGroup): Likewise.
	* algebra/pfo.spad.pamphlet (FunctionSpaceReduce): Likewise.
	* algebra/setorder.spad.pamphlet: Likewise.
	* algebra/ffcat.spad.pamphlet (FiniteFieldCategory): Add
	parenthesis for call to niladic function 'representationType'.
	* algebra/ffnb.spad.pamphlet
	(FiniteFieldNormalBasisExtensionByPolynomial): Likewise for
	normalElement. 
	* algebra/float.spad.pamphlet (Float): Likewise for OMencodingXML,
	pi, log2, log10, digits.
	* algebra/fnla.spad.pamphlet (FreeNilpotentLie): Likewise for
	dimension. 
	* algebra/fraction.spad.pamphlet (Fraction): Likewise for
	OMencodingXML. 
	* algebra/gaussian.spad.pamphlet (Complex): Likewise.
	* algebra/integer.spad.pamphlet (Integer): Likewise.
	* algebra/list.spad.pamphlet (List): Likewise.
	* algebra/sf.spad.pamphlet (DoubleFloat): Likewise.
	* algebra/si.spad.pamphlet (SingleInteger): Likewise.
	* algebra/string.spad.pamphlet (String): Likewise.
	* algebra/symbol.spad.pamphlet (Symbol): Likewise.
	* algebra/intrf.spad.pamphlet (TranscendentalIntegration):
	Likewise for empty.
	* algebra/kl.spad.pamphlet (SortedCache): Likewise for cache, void.
	* algebra/newdata.spad.pamphlet (TabulatedComputationPackage):
	Likewise for usingTable?.
	* algebra/omserver.spad.pamphlet (OpenMathServerPackage): Likewise
	for OMencodingUnknown.
	* algebra/plot.spad.pamphlet (Plot): Likewise for adaptive?.
	* algebra/plot3d.spad.pamphlet (Plot3D): Likewise for adaptive3D?.

1 files changed, 6 insertions, 4 deletions

diff --git a/src/algebra/plot3d.spad.pamphlet b/src/algebra/plot3d.spad.pamphlet
index 579e7b22..eae26c33 100644
--- a/src/algebra/plot3d.spad.pamphlet
+++ b/src/algebra/plot3d.spad.pamphlet
@@ -402,7 +402,7 @@ Plot3D(): Exports == Implementation where
       xRange := join(curves,1); yRange := join(curves,2)
       zRange := join(curves,3)
       scrres := p.screenres
-      if adaptive3D? then
+      if adaptive3D?() then
         tlimit := 8
         curves := [adaptivePlot(c,nRange,xRange,yRange,zRange, _
                    tlimit,scrres := 2*scrres) for c in curves]
@@ -418,7 +418,7 @@ Plot3D(): Exports == Implementation where
       curves: L C := [rangeRefine(c,tRange) for c in p.functions]
       xRange := join(curves,1); yRange := join(curves,2)
       zRange := join(curves,3)
-      if adaptive3D? then
+      if adaptive3D?() then
         tlimit := 8
         curves := [adaptivePlot(c,tRange,xRange,yRange,zRange,tlimit, _
                       p.screenres) for c in curves]
@@ -432,7 +432,7 @@ Plot3D(): Exports == Implementation where
       p := basicPlot(f,tRange)
       r := p.ranges
       NUMFUNEVALS := MINPOINTS
-      if adaptive3D? then
+      if adaptive3D?() then
        p := adaptivePlot(p,first r,second r,third r,fourth r,8,SCREENRES)
 --      print(NUMFUNEVALS::OUT)
 --      print(p::OUT)
@@ -456,7 +456,7 @@ Plot3D(): Exports == Implementation where
       p := basicPlot(point(myTrap(f1,#1),myTrap(f2,#1),myTrap(f3,#1),col(#1)),tRange)
       r := p.ranges
       NUMFUNEVALS := MINPOINTS
-      if adaptive3D? then
+      if adaptive3D?() then
        p := adaptivePlot(p,first r,second r,third r,fourth r,8,SCREENRES)
 --      print(NUMFUNEVALS::OUT)
       [ rest r, r, SCREENRES, nil(), [ p ] ]
@@ -500,6 +500,8 @@ Plot3D(): Exports == Implementation where
 <<license>>=
 --Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd.
 --All rights reserved.
+-- Copyright (C) 2007-2010, Gabriel Dos Reis.
+-- All rights reserved.
 --
 --Redistribution and use in source and binary forms, with or without
 --modification, are permitted provided that the following conditions are