From ae81d788f27a95c608b860d8a989f56c8796803e Mon Sep 17 00:00:00 2001 From: dos-reis Date: Sat, 14 May 2011 22:54:11 +0000 Subject: Remove recently introduced bpNamedScope --- src/boot/strap/parser.clisp | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'src/boot/strap') diff --git a/src/boot/strap/parser.clisp b/src/boot/strap/parser.clisp index 00381889..e780b7a7 100644 --- a/src/boot/strap/parser.clisp +++ b/src/boot/strap/parser.clisp @@ -499,7 +499,7 @@ (T NIL))))) (DEFUN |bpNamespace| () - (AND (|bpEqKey| 'NAMESPACE) (|bpName|) + (AND (|bpEqKey| 'NAMESPACE) (OR (|bpName|) (|bpDot|)) (|bpPush| (|%Namespace| (|bpPop1|))))) (DEFUN |bpTypeAliasDefition| () @@ -627,16 +627,11 @@ (|bpPush| (|bfElt| (|bpPop2|) (|bpPop1|)))) (|bpPush| (|bfSuffixDot| (|bpPop1|)))))) -(DEFUN |bpNamedScope| () - (AND (|bpEqKey| 'NAMESPACE) (OR (|bpName|) (|bpDot|) (|bpTrap|)) - (|bpPush| (|%Namespace| (|bpPop1|))))) - (DEFUN |bpApplication| () - (OR (AND (|bpPrimary|) (|bpAnyNo| #'|bpSelector|) - (OR (AND (|bpApplication|) - (|bpPush| (|bfApplication| (|bpPop2|) (|bpPop1|)))) - T)) - (|bpNamedScope|))) + (AND (|bpPrimary|) (|bpAnyNo| #'|bpSelector|) + (OR (AND (|bpApplication|) + (|bpPush| (|bfApplication| (|bpPop2|) (|bpPop1|)))) + T))) (DEFUN |bpTyping| () (COND -- cgit v1.2.3