diff options
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/interp/nrungo.boot | 1 | ||||
| -rw-r--r-- | src/interp/parse.boot | 10 |
3 files changed, 7 insertions, 10 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 8c885d12..44bf6a01 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,11 @@ 2009-06-10 Gabriel Dos Reis <gdr@cs.tamu.edu> + * interp/parse.boot (parseDropAssertions): Remove. + (parseCategory): Don't call it. + * interp/nrungo.boot (lookupPred): Don't check for "asserted". + +2009-06-10 Gabriel Dos Reis <gdr@cs.tamu.edu> + * interp/parse.boot (parseHas): Preserve unnamed category forms. * interp/i-funsel.boot (hasCaty): Recursively look into Joins. * interp/interop.boot (newHasCategory): Likewise. diff --git a/src/interp/nrungo.boot b/src/interp/nrungo.boot index 944606f1..cf17fc20 100644 --- a/src/interp/nrungo.boot +++ b/src/interp/nrungo.boot @@ -246,7 +246,6 @@ lookupInCategories(op,sig,dom,dollar) == --======================================================= lookupPred(pred,dollar,domain) == pred = true => true - pred = 'asserted => false pred is ['AND,:pl] or pred is ['and,:pl] => and/[lookupPred(p,dollar,domain) for p in pl] pred is ['OR,:pl] or pred is ['or,:pl] => diff --git a/src/interp/parse.boot b/src/interp/parse.boot index 6daf3ea3..f2ff3381 100644 --- a/src/interp/parse.boot +++ b/src/interp/parse.boot @@ -244,21 +244,13 @@ parseCategory: %ParseForm -> %Form parseCategory t == t isnt ["CATEGORY",:x] => systemErrorHere ["parseCategory",t] $parsingType: local := true - l:= parseTranList parseDropAssertions x + l:= parseTranList x key:= CONTAINED("$",l) => "domain" "package" ["CATEGORY",key,:l] -parseDropAssertions: %ParseForm -> %Form -parseDropAssertions x == ---note: the COPY of this list is necessary-- do not replace by RPLACing version - x is [y,:r] => - y is ["IF","asserted",:.] => parseDropAssertions r - [y,:parseDropAssertions r] - x - parseLessEqual: %ParseForm -> %Form parseLessEqual u == parseTran ["not",[substitute(">","<=",first u),:rest u]] |