From 8025b52f2a760841ac47352f3eef59a8f45d0807 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Fri, 3 Jun 2016 11:29:53 -0700 Subject: [PATCH] bootstrap.syntax: more words lowercased. --- core/bootstrap/syntax.factor | 8 ++++++-- core/syntax/syntax.factor | 13 +++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/core/bootstrap/syntax.factor b/core/bootstrap/syntax.factor index 79ed8bc319..58a186e057 100644 --- a/core/bootstrap/syntax.factor +++ b/core/bootstrap/syntax.factor @@ -22,6 +22,7 @@ IN: bootstrap.syntax "defer:" "ERROR:" "FORGET:" + "forget:" "GENERIC#" "GENERIC:" "HOOK:" @@ -35,6 +36,7 @@ IN: bootstrap.syntax "main:" "MATH:" "MIXIN:" + "mixin:" "NAN:" "nan:" "P\"" @@ -45,15 +47,14 @@ IN: bootstrap.syntax "PRIVATE>" "SBUF\"" "SINGLETON:" + "singleton:" "SINGLETONS:" "BUILTIN:" - "builtin:" "SYMBOL:" "symbol:" "SYMBOLS:" "CONSTANT:" "TUPLE:" - "final" "SLOT:" "T{" "UNION:" @@ -61,6 +62,7 @@ IN: bootstrap.syntax "USE:" "use:" "UNUSE:" + "unuse:" "USING:" "QUALIFIED:" "QUALIFIED-WITH:" @@ -82,12 +84,14 @@ IN: bootstrap.syntax "foldable" "inline" "recursive" + "final" "@delimiter" "@deprecated" "@flushable" "@foldable" "@inline" "@recursive" + "@final" "t" "{" "}" diff --git a/core/syntax/syntax.factor b/core/syntax/syntax.factor index 960b9da675..074c7ca26f 100644 --- a/core/syntax/syntax.factor +++ b/core/syntax/syntax.factor @@ -78,6 +78,7 @@ IN: bootstrap.syntax "use:" [ scan-token use-vocab ] define-core-syntax "UNUSE:" [ scan-token unuse-vocab ] define-core-syntax + "unuse:" [ scan-token unuse-vocab ] define-core-syntax "USING:" [ ";" [ use-vocab ] each-token ] define-core-syntax @@ -222,6 +223,9 @@ IN: bootstrap.syntax "MIXIN:" [ scan-new-class define-mixin-class ] define-core-syntax + "mixin:" [ + scan-new-class define-mixin-class + ] define-core-syntax "INSTANCE:" [ location [ @@ -240,6 +244,9 @@ IN: bootstrap.syntax "SINGLETON:" [ scan-new-class define-singleton-class ] define-core-syntax + "singleton:" [ + scan-new-class define-singleton-class + ] define-core-syntax "TUPLE:" [ parse-tuple-definition define-tuple-class @@ -248,6 +255,9 @@ IN: bootstrap.syntax "final" [ last-word make-final ] define-core-syntax + "@final" [ + last-word make-final + ] define-core-syntax "SLOT:" [ scan-token define-protocol-slot @@ -266,6 +276,9 @@ IN: bootstrap.syntax "FORGET:" [ scan-object forget ] define-core-syntax + "forget:" [ + scan-object forget + ] define-core-syntax "(" [ ")" parse-effect suffix!