aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2010-12-08 05:49:29 +0000
committerdos-reis <gdr@axiomatics.org>2010-12-08 05:49:29 +0000
commit007ce83d9d0c7dee255b35120d671cab5ab0f33e (patch)
treec11af8062b8b3ad2bfc2e56bbfdf3536c4afbf70
parentacd73b3b9926403115db4db68361703bff439889 (diff)
downloadopen-axiom-007ce83d9d0c7dee255b35120d671cab5ab0f33e.tar.gz
* algebra/acplot.spad.pamphlet: Fix decimal constant notation.
* interp/fnewmeta.lisp: Replace MATCH-ADVANCE-STRING with MATCH-ADVANCE-KEYWORD when matching for keywords.
-rw-r--r--src/ChangeLog6
-rw-r--r--src/algebra/acplot.spad.pamphlet2
-rw-r--r--src/interp/fnewmeta.lisp56
3 files changed, 35 insertions, 29 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 20b34695..126f7cb2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,11 @@
2010-12-07 Gabriel Dos Reis <gdr@cs.tamu.edu>
+ * algebra/acplot.spad.pamphlet: Fix decimal constant notation.
+ * interp/fnewmeta.lisp: Replace MATCH-ADVANCE-STRING with
+ MATCH-ADVANCE-KEYWORD when matching for keywords.
+
+2010-12-07 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
* interp/compiler.boot (compThrow): Remove niladic type restriction.
(compCatch): Tidy.
(compTry): Likewise.
diff --git a/src/algebra/acplot.spad.pamphlet b/src/algebra/acplot.spad.pamphlet
index cf69d391..9a33330a 100644
--- a/src/algebra/acplot.spad.pamphlet
+++ b/src/algebra/acplot.spad.pamphlet
@@ -208,7 +208,7 @@ PlaneAlgebraicCurvePlot():Exports == Implementation where
--% global constants
- EPSILON : NF := .000001 -- precision to which realSolve finds roots
+ EPSILON : NF := 0.000001 -- precision to which realSolve finds roots
PLOTERR : SF := float(1,-3,10)
-- maximum allowable difference in each coordinate when
-- determining if 2 plotted points are equal
diff --git a/src/interp/fnewmeta.lisp b/src/interp/fnewmeta.lisp
index 024ed7c5..7e152d36 100644
--- a/src/interp/fnewmeta.lisp
+++ b/src/interp/fnewmeta.lisp
@@ -143,7 +143,7 @@
(DEFUN |PARSE-With| ()
- (AND (MATCH-ADVANCE-STRING "with") (MUST (|PARSE-Category|))
+ (AND (MATCH-ADVANCE-KEYWORD "with") (MUST (|PARSE-Category|))
(PUSH-REDUCTION '|PARSE-With|
(CONS '|with| (CONS (POP-STACK-1) NIL)))))
@@ -151,12 +151,12 @@
(DEFUN |PARSE-Category| ()
(PROG (G1)
(RETURN
- (OR (AND (MATCH-ADVANCE-STRING "if") (MUST (|PARSE-Expression|))
- (MUST (MATCH-ADVANCE-STRING "then"))
+ (OR (AND (MATCH-ADVANCE-KEYWORD "if") (MUST (|PARSE-Expression|))
+ (MUST (MATCH-ADVANCE-KEYWORD "then"))
(MUST (|PARSE-Category|))
(BANG FIL_TEST
(OPTIONAL
- (AND (MATCH-ADVANCE-STRING "else")
+ (AND (MATCH-ADVANCE-KEYWORD "else")
(MUST (|PARSE-Category|)))))
(PUSH-REDUCTION '|PARSE-Category|
(CONS '|if|
@@ -200,11 +200,11 @@
(DEFUN |PARSE-Import| ()
- (AND (MATCH-ADVANCE-STRING "import")
+ (AND (MATCH-ADVANCE-KEYWORD "import")
(MUST (|PARSE-Expr| 1000))
(OR (AND (MATCH-ADVANCE-STRING ":")
(MUST (|PARSE-Expression|))
- (MUST (MATCH-ADVANCE-STRING "from"))
+ (MUST (MATCH-ADVANCE-KEYWORD "from"))
(MUST (|PARSE-Expr| 1000))
(PUSH-REDUCTION '|PARSE-Import|
(CONS '|%SignatureImport|
@@ -224,7 +224,7 @@
;; deliberate restriction on naming one type at a time.
;; -- gdr, 2009-02-28.
(DEFUN |PARSE-Inline| ()
- (AND (MATCH-ADVANCE-STRING "inline")
+ (AND (MATCH-ADVANCE-KEYWORD "inline")
(MUST (|PARSE-Expr| 1000))
(PUSH-REDUCTION '|PARSE-Inline|
(CONS '|%Inline| (CONS (POP-STACK-1) NIL)))))
@@ -244,9 +244,9 @@
(|PARSE-Application|)))
(DEFUN |PARSE-Quantifier| ()
- (OR (AND (MATCH-ADVANCE-STRING "forall")
+ (OR (AND (MATCH-ADVANCE-KEYWORD "forall")
(MUST (PUSH-REDUCTION '|PARSE-Quantifier| '|%Forall|)))
- (AND (MATCH-ADVANCE-STRING "exist")
+ (AND (MATCH-ADVANCE-KEYWORD "exist")
(MUST (PUSH-REDUCTION '|PARSE-Quantifier| '|%Exist|)))))
(DEFUN |PARSE-QuantifiedVariableList| ()
@@ -322,7 +322,7 @@
;; We should factorize these boilerplates
(DEFUN |PARSE-Return| ()
- (AND (MATCH-ADVANCE-STRING "return") (MUST (|PARSE-Expression|))
+ (AND (MATCH-ADVANCE-KEYWORD "return") (MUST (|PARSE-Expression|))
(PUSH-REDUCTION '|PARSE-Return|
(CONS '|return| (CONS (POP-STACK-1) NIL)))))
@@ -384,7 +384,7 @@
(DEFUN |PARSE-Exit| ()
- (AND (MATCH-ADVANCE-STRING "exit")
+ (AND (MATCH-ADVANCE-KEYWORD "exit")
(MUST (OR (|PARSE-Expression|)
(PUSH-REDUCTION '|PARSE-Exit| '|$NoValue|)))
(PUSH-REDUCTION '|PARSE-Exit|
@@ -392,7 +392,7 @@
(DEFUN |PARSE-Leave| ()
- (AND (MATCH-ADVANCE-STRING "leave")
+ (AND (MATCH-ADVANCE-KEYWORD "leave")
(MUST (OR (|PARSE-Expression|)
(PUSH-REDUCTION '|PARSE-Leave| '|$NoValue|)))
(MUST (PUSH-REDUCTION '|PARSE-Leave|
@@ -408,11 +408,11 @@
(DEFUN |PARSE-Conditional| ()
- (AND (MATCH-ADVANCE-STRING "if") (MUST (|PARSE-Expression|))
- (MUST (MATCH-ADVANCE-STRING "then")) (MUST (|PARSE-Expression|))
+ (AND (MATCH-ADVANCE-KEYWORD "if") (MUST (|PARSE-Expression|))
+ (MUST (MATCH-ADVANCE-KEYWORD "then")) (MUST (|PARSE-Expression|))
(BANG FIL_TEST
(OPTIONAL
- (AND (MATCH-ADVANCE-STRING "else")
+ (AND (MATCH-ADVANCE-KEYWORD "else")
(MUST (|PARSE-ElseClause|)))))
(PUSH-REDUCTION '|PARSE-Conditional|
(CONS '|if|
@@ -427,21 +427,21 @@
(DEFUN |PARSE-Loop| ()
(OR (AND (STAR REPEATOR (|PARSE-Iterator|))
- (MUST (MATCH-ADVANCE-STRING "repeat"))
+ (MUST (MATCH-ADVANCE-KEYWORD "repeat"))
(MUST (|PARSE-Expr| 110))
(PUSH-REDUCTION '|PARSE-Loop|
(CONS 'REPEAT
(APPEND (POP-STACK-2) (CONS (POP-STACK-1) NIL)))))
- (AND (MATCH-ADVANCE-STRING "repeat") (MUST (|PARSE-Expr| 110))
+ (AND (MATCH-ADVANCE-KEYWORD "repeat") (MUST (|PARSE-Expr| 110))
(PUSH-REDUCTION '|PARSE-Loop|
(CONS 'REPEAT (CONS (POP-STACK-1) NIL))))))
(DEFUN |PARSE-Iterator| ()
- (OR (AND (MATCH-ADVANCE-STRING "for") (MUST (|PARSE-Primary|))
- (MUST (MATCH-ADVANCE-STRING "in"))
+ (OR (AND (MATCH-ADVANCE-KEYWORD "for") (MUST (|PARSE-Primary|))
+ (MUST (MATCH-ADVANCE-KEYWORD "in"))
(MUST (|PARSE-Expression|))
- (MUST (OR (AND (MATCH-ADVANCE-STRING "by")
+ (MUST (OR (AND (MATCH-ADVANCE-KEYWORD "by")
(MUST (|PARSE-Expr| 200))
(PUSH-REDUCTION '|PARSE-Iterator|
(CONS 'INBY
@@ -457,18 +457,18 @@
(MUST (|PARSE-Expr| 111))
(PUSH-REDUCTION '|PARSE-Iterator|
(CONS '|\|| (CONS (POP-STACK-1) NIL))))))
- (AND (MATCH-ADVANCE-STRING "while") (MUST (|PARSE-Expr| 190))
+ (AND (MATCH-ADVANCE-KEYWORD "while") (MUST (|PARSE-Expr| 190))
(PUSH-REDUCTION '|PARSE-Iterator|
(CONS 'WHILE (CONS (POP-STACK-1) NIL))))
- (AND (MATCH-ADVANCE-STRING "until") (MUST (|PARSE-Expr| 190))
+ (AND (MATCH-ADVANCE-KEYWORD "until") (MUST (|PARSE-Expr| 190))
(PUSH-REDUCTION '|PARSE-Iterator|
(CONS 'UNTIL (CONS (POP-STACK-1) NIL))))))
(DEFUN |PARSE-Match| ()
- (AND (MATCH-ADVANCE-STRING "case")
+ (AND (MATCH-ADVANCE-KEYWORD "case")
(MUST (|PARSE-Expr| 400))
- (MATCH-ADVANCE-STRING "is")
+ (MATCH-ADVANCE-KEYWORD "is")
(MUST (|PARSE-Expr| 110))
(PUSH-REDUCTION '|PARSE-Match|
(CONS '|%Match|
@@ -542,16 +542,16 @@
(DEFUN |PARSE-Form| ()
- (OR (AND (MATCH-ADVANCE-STRING "iterate")
+ (OR (AND (MATCH-ADVANCE-KEYWORD "iterate")
(BANG FIL_TEST
(OPTIONAL
- (AND (MATCH-ADVANCE-STRING "from")
+ (AND (MATCH-ADVANCE-KEYWORD "from")
(MUST (|PARSE-Label|))
(PUSH-REDUCTION '|PARSE-Form|
(CONS (POP-STACK-1) NIL)))))
(PUSH-REDUCTION '|PARSE-Form|
(CONS '|iterate| (APPEND (POP-STACK-1) NIL))))
- (AND (MATCH-ADVANCE-STRING "yield") (MUST (|PARSE-Application|))
+ (AND (MATCH-ADVANCE-KEYWORD "yield") (MUST (|PARSE-Application|))
(PUSH-REDUCTION '|PARSE-Form|
(CONS '|yield| (CONS (POP-STACK-1) NIL))))
(|PARSE-Application|)))
@@ -848,7 +848,7 @@
(DEFUN |PARSE-IteratorTail| ()
- (OR (AND (MATCH-ADVANCE-STRING "repeat")
+ (OR (AND (MATCH-ADVANCE-KEYWORD "repeat")
(BANG FIL_TEST
(OPTIONAL (STAR REPEATOR (|PARSE-Iterator|)))))
(STAR REPEATOR (|PARSE-Iterator|))))