* boot/tokens.boot: quo and rem are now keywords and infix operators.

	* boot/parser.boot (bpEuclid): New.  Parse integer quotient and
	remainder expressions.
	(bpMinus): Now build on bpEuclid instead of bpTimes.

1 files changed, 6 insertions, 0 deletions

diff --git a/src/boot/tokens.boot b/src/boot/tokens.boot
index 1424c6cd..476d0a62 100644
--- a/src/boot/tokens.boot
+++ b/src/boot/tokens.boot
@@ -56,8 +56,10 @@ shoeKeyWords == [  _
             ['"namespace", "NAMESPACE"], _
             ['"of",   "OF"] , _
             ['"or",   "OR"] , _
+            ['"rem",  "REM"], _
             ['"repeat", "REPEAT"] , _
             ['"return", "RETURN"], _
+            ['"quo",     "QUO"], _
             ['"structure", "STRUCTURE"], _
             ['"then",  "THEN"], _
             ['"throw", "THROW"], _
@@ -187,6 +189,8 @@ for i in [ _
 for i in [      _
         ["SHOEEQ"    ,"="], _
         ["TIMES"    ,"*"], _
+        ["REM",    "rem"],_
+        ["QUO",    "quo"],_
         ["PLUS" ,"+"], _
         ["IS"   ,"is"], _
         ["ISNT" ,"isnt"], _
@@ -294,6 +298,8 @@ for i in [ _
   ["MINUS",     "-"]  , _
   ["TIMES",          "*"]  , _
   ["POWER",          "EXPT"]  , _
+  ['REM,          'REM],_
+  ['QUO,     'TRUNCATE],_
   ["SLASH",       "/"]  , _
   ["LT",              "<"], _
   ["GT",              ">"] , _