From 147ae66ab541f63ffd11df094b8edf4f3b4cbcba Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sat, 26 Aug 2017 14:20:04 -0500 Subject: [PATCH] factor: SYNTAX: \foo --- basis/alien/destructors/destructors.factor | 2 +- basis/alien/endian/endian.factor | 8 ++--- basis/alien/syntax/syntax.factor | 26 ++++++++-------- basis/cocoa/apple-script/apple-script.factor | 2 +- basis/cocoa/cocoa.factor | 6 ++-- basis/cocoa/subclassing/subclassing.factor | 6 ++-- basis/colors/constants/constants.factor | 2 +- basis/colors/hex/hex.factor | 2 +- .../dataflow-analysis.factor | 4 +-- .../cfg/instructions/syntax/syntax.factor | 8 ++--- basis/compiler/cfg/registers/registers.factor | 4 +-- .../cfg/renaming/functor/functor.factor | 2 +- basis/compiler/codegen/codegen.factor | 4 +-- basis/core-foundation/strings/strings.factor | 2 +- basis/cpu/x86/assembler/syntax/syntax.factor | 4 +-- basis/definitions/icons/icons.factor | 2 +- basis/delegate/delegate.factor | 8 ++--- basis/functors/functors.factor | 14 ++++----- .../gobject-introspection.factor | 10 +++---- basis/hashtables/identity/identity.factor | 2 +- basis/hashtables/sequences/sequences.factor | 2 +- basis/help/syntax/syntax.factor | 6 ++-- basis/help/tips/tips.factor | 2 +- basis/hints/hints.factor | 2 +- .../chloe/components/components.factor | 2 +- .../html/templates/chloe/syntax/syntax.factor | 2 +- basis/io/encodings/8-bit/8-bit.factor | 2 +- basis/io/encodings/euc/euc.factor | 2 +- basis/locals/locals.factor | 10 +++---- basis/logging/logging.factor | 2 +- basis/macros/macros.factor | 2 +- basis/match/match.factor | 2 +- basis/math/complex/complex.factor | 2 +- .../rectangles/prettyprint/prettyprint.factor | 2 +- basis/math/rectangles/rectangles-tests.factor | 30 +++++++++---------- basis/math/rectangles/rectangles.factor | 2 +- basis/math/vectors/simd/cords/cords.factor | 2 +- basis/math/vectors/simd/simd.factor | 2 +- basis/memoize/memoize.factor | 4 +-- basis/multiline/multiline-tests.factor | 2 +- basis/opengl/gl/extensions/extensions.factor | 2 +- basis/peg/ebnf/ebnf.factor | 14 ++++----- basis/peg/peg.factor | 2 +- basis/persistent/hashtables/hashtables.factor | 2 +- basis/persistent/vectors/vectors.factor | 2 +- basis/promises/promises.factor | 2 +- basis/roman/roman.factor | 4 +-- basis/tools/test/test.factor | 2 +- basis/tools/walker/walker.factor | 2 +- basis/tr/tr.factor | 2 +- basis/typed/typed.factor | 4 +-- .../ui/gadgets/prettyprint/prettyprint.factor | 2 +- basis/ui/ui.factor | 4 +-- basis/unicode/categories/categories.factor | 4 +-- basis/vlists/vlists.factor | 2 +- basis/windows/com/syntax/syntax.factor | 4 +-- basis/x11/syntax/syntax.factor | 2 +- basis/xml/errors/errors.factor | 2 +- basis/xml/syntax/syntax.factor | 6 ++-- basis/xmode/loader/syntax/syntax.factor | 2 +- extra/alien/data/map/map.factor | 4 +-- extra/alien/fortran/fortran.factor | 6 ++-- extra/arrays/shaped/shaped.factor | 2 +- extra/calendar/holidays/holidays.factor | 4 +-- extra/changer/changer.factor | 2 +- extra/classes/struct/vectored/vectored.factor | 2 +- extra/colors/flex-hex/flex-hex.factor | 2 +- extra/constructors/constructors.factor | 4 +-- extra/cpu/8080/emulator/emulator.factor | 6 ++-- extra/cpu/arm/assembler/assembler.factor | 2 +- extra/cuda/syntax/syntax.factor | 6 ++-- extra/decimals/decimals.factor | 2 +- extra/descriptive/descriptive.factor | 4 +-- extra/dice/dice.factor | 2 +- extra/game/worlds/worlds.factor | 2 +- extra/gml/macros/macros.factor | 2 +- extra/gml/runtime/runtime.factor | 10 +++---- extra/gpu/render/render.factor | 2 +- extra/gpu/shaders/shaders.factor | 14 ++++----- extra/hash-sets/numbers/numbers.factor | 2 +- extra/hashtables/numbers/numbers.factor | 2 +- extra/infix/infix.factor | 2 +- extra/irc/messages/base/base.factor | 2 +- extra/math/derivatives/syntax/syntax.factor | 2 +- extra/memory/pools/pools.factor | 2 +- extra/method-chains/method-chains.factor | 4 +-- extra/money/money.factor | 2 +- extra/mongodb/tuple/tuple.factor | 2 +- extra/multi-methods/multi-methods.factor | 6 ++-- extra/opencl/syntax/syntax.factor | 2 +- extra/pair-methods/pair-methods.factor | 4 +-- extra/poker/poker-docs.factor | 2 +- extra/poker/poker.factor | 2 +- extra/project-euler/common/common.factor | 2 +- extra/python/syntax/syntax.factor | 6 ++-- extra/qw/qw.factor | 2 +- extra/roles/roles.factor | 4 +-- extra/slides/slides.factor | 2 +- extra/slots/syntax/syntax.factor | 18 +++++------ extra/smalltalk/selectors/selectors.factor | 2 +- extra/trees/avl/avl.factor | 2 +- extra/trees/splay/splay.factor | 2 +- extra/trees/trees.factor | 2 +- extra/units/reduction/reduction.factor | 2 +- extra/variables/variables.factor | 10 +++---- extra/variants/variants.factor | 4 +-- extra/vocabs/git/git.factor | 2 +- extra/xkcd/xkcd.factor | 2 +- 108 files changed, 221 insertions(+), 221 deletions(-) diff --git a/basis/alien/destructors/destructors.factor b/basis/alien/destructors/destructors.factor index 27d7440454..7582c1b263 100644 --- a/basis/alien/destructors/destructors.factor +++ b/basis/alien/destructors/destructors.factor @@ -29,4 +29,4 @@ M: F-destructor dispose alien>> F N ndrop ; ;FUNCTOR> -SYNTAX: DESTRUCTOR: scan-word define-destructor ; +SYNTAX: \DESTRUCTOR: scan-word define-destructor ; diff --git a/basis/alien/endian/endian.factor b/basis/alien/endian/endian.factor index 518447efc7..f2b0dd6d1b 100644 --- a/basis/alien/endian/endian.factor +++ b/basis/alien/endian/endian.factor @@ -147,18 +147,18 @@ ERROR: unsupported-endian-type endian slot ; [ compute-struct-offsets ] [ drop 1 ] (define-struct-class) ; -SYNTAX: LE-STRUCT: +SYNTAX: \LE-STRUCT: parse-struct-definition little-endian define-endian-struct-class ; -SYNTAX: BE-STRUCT: +SYNTAX: \BE-STRUCT: parse-struct-definition big-endian define-endian-struct-class ; -SYNTAX: LE-PACKED-STRUCT: +SYNTAX: \LE-PACKED-STRUCT: parse-struct-definition little-endian define-endian-packed-struct-class ; -SYNTAX: BE-PACKED-STRUCT: +SYNTAX: \BE-PACKED-STRUCT: parse-struct-definition big-endian define-endian-packed-struct-class ; diff --git a/basis/alien/syntax/syntax.factor b/basis/alien/syntax/syntax.factor index cbf93f735a..ae79370192 100755 --- a/basis/alien/syntax/syntax.factor +++ b/basis/alien/syntax/syntax.factor @@ -6,37 +6,37 @@ strings.parser vocabs words ; << "alien.arrays" require >> ! needed for bootstrap IN: alien.syntax -SYNTAX: DLL" lexer get skip-blank parse-string dlopen suffix! ; +SYNTAX: \DLL" lexer get skip-blank parse-string dlopen suffix! ; -SYNTAX: ALIEN: 16 scan-base suffix! ; +SYNTAX: \ALIEN: 16 scan-base suffix! ; -SYNTAX: BAD-ALIEN suffix! ; +SYNTAX: \BAD-ALIEN suffix! ; -SYNTAX: LIBRARY: scan-token current-library set ; +SYNTAX: \LIBRARY: scan-token current-library set ; -SYNTAX: FUNCTION: +SYNTAX: \FUNCTION: (FUNCTION:) make-function define-inline ; -SYNTAX: FUNCTION-ALIAS: +SYNTAX: \FUNCTION-ALIAS: scan-token create-function (FUNCTION:) (make-function) define-inline ; -SYNTAX: CALLBACK: +SYNTAX: \CALLBACK: (CALLBACK:) define-inline ; -SYNTAX: TYPEDEF: +SYNTAX: \TYPEDEF: scan-c-type CREATE-C-TYPE dup save-location typedef ; -SYNTAX: ENUM: +SYNTAX: \ENUM: parse-enum (define-enum) ; -SYNTAX: C-TYPE: +SYNTAX: \C-TYPE: void CREATE-C-TYPE typedef ; -SYNTAX: &: +SYNTAX: \&: scan-token current-library get '[ _ _ address-of ] append! ; -SYNTAX: C-GLOBAL: scan-c-type scan-new-word define-global ; +SYNTAX: \C-GLOBAL: scan-c-type scan-new-word define-global ; -SYNTAX: pointer: +SYNTAX: \pointer: scan-c-type suffix! ; diff --git a/basis/cocoa/apple-script/apple-script.factor b/basis/cocoa/apple-script/apple-script.factor index 123bf4c842..9c12817fdc 100644 --- a/basis/cocoa/apple-script/apple-script.factor +++ b/basis/cocoa/apple-script/apple-script.factor @@ -11,6 +11,6 @@ IN: cocoa.apple-script -> initWithSource: -> autorelease f -> executeAndReturnError: drop ; -SYNTAX: APPLESCRIPT: +SYNTAX: \APPLESCRIPT: scan-new-word scan-object [ run-apple-script ] curry ( -- ) define-declared ; diff --git a/basis/cocoa/cocoa.factor b/basis/cocoa/cocoa.factor index e92f0f9068..72c9a559b3 100644 --- a/basis/cocoa/cocoa.factor +++ b/basis/cocoa/cocoa.factor @@ -16,7 +16,7 @@ SYNTAX: -> scan-token dup remember-send suffix! \ send suffix! ; SYNTAX: ?-> scan-token dup remember-send suffix! \ ?send suffix! ; -SYNTAX: SEL: +SYNTAX: \SEL: scan-token [ remember-send ] [ suffix! \ cocoa.messages:selector suffix! ] bi ; @@ -34,9 +34,9 @@ frameworks [ V{ } clone ] initialize [ frameworks get [ load-framework ] each ] "cocoa" add-startup-hook -SYNTAX: FRAMEWORK: scan-token [ load-framework ] [ frameworks get push ] bi ; +SYNTAX: \FRAMEWORK: scan-token [ load-framework ] [ frameworks get push ] bi ; -SYNTAX: IMPORT: scan-token [ ] import-objc-class ; +SYNTAX: \IMPORT: scan-token [ ] import-objc-class ; "Importing Cocoa classes..." print diff --git a/basis/cocoa/subclassing/subclassing.factor b/basis/cocoa/subclassing/subclassing.factor index b737a3cfce..b136cf10b6 100644 --- a/basis/cocoa/subclassing/subclassing.factor +++ b/basis/cocoa/subclassing/subclassing.factor @@ -71,12 +71,12 @@ IN: cocoa.subclassing TUPLE: cocoa-protocol name ; C: cocoa-protocol -SYNTAX: COCOA-PROTOCOL: +SYNTAX: \COCOA-PROTOCOL: scan-token suffix! ; SYMBOL: ;CLASS> -SYNTAX: ?rewrite-closures first ; -SYNTAX: METHOD: +SYNTAX: \METHOD: scan-c-type parse-selector parse-method-body [ swap ] 2dip 4array ";" expect diff --git a/basis/colors/constants/constants.factor b/basis/colors/constants/constants.factor index 3c84dea912..93ab176c4d 100644 --- a/basis/colors/constants/constants.factor +++ b/basis/colors/constants/constants.factor @@ -31,4 +31,4 @@ ERROR: no-such-color name ; : named-color ( name -- color ) dup colors at [ ] [ no-such-color ] ?if ; -SYNTAX: color: scan-token named-color suffix! ; +SYNTAX: \color: scan-token named-color suffix! ; diff --git a/basis/colors/hex/hex.factor b/basis/colors/hex/hex.factor index 05b9f0172c..eec5f7cd29 100644 --- a/basis/colors/hex/hex.factor +++ b/basis/colors/hex/hex.factor @@ -18,4 +18,4 @@ IN: colors.hex [ red>> ] [ green>> ] [ blue>> ] tri [ 255 * >integer ] tri@ "%02X%02X%02X" sprintf ; -SYNTAX: hexcolor: scan-token hex>rgba suffix! ; +SYNTAX: \hexcolor: scan-token hex>rgba suffix! ; diff --git a/basis/compiler/cfg/dataflow-analysis/dataflow-analysis.factor b/basis/compiler/cfg/dataflow-analysis/dataflow-analysis.factor index 174eb09540..59f0e1a33a 100644 --- a/basis/compiler/cfg/dataflow-analysis/dataflow-analysis.factor +++ b/basis/compiler/cfg/dataflow-analysis/dataflow-analysis.factor @@ -133,8 +133,8 @@ INSTANCE: name backward-analysis PRIVATE> -SYNTAX: FORWARD-ANALYSIS: +SYNTAX: \FORWARD-ANALYSIS: scan-token [ define-analysis ] [ define-forward-analysis ] bi ; -SYNTAX: BACKWARD-ANALYSIS: +SYNTAX: \BACKWARD-ANALYSIS: scan-token [ define-analysis ] [ define-backward-analysis ] bi ; diff --git a/basis/compiler/cfg/instructions/syntax/syntax.factor b/basis/compiler/cfg/instructions/syntax/syntax.factor index 12fbe0745e..645e1d99e1 100644 --- a/basis/compiler/cfg/instructions/syntax/syntax.factor +++ b/basis/compiler/cfg/instructions/syntax/syntax.factor @@ -88,14 +88,14 @@ TUPLE: insn-slot-spec type name rep ; [ nip define-insn-ctor ] } 3cleave ; -SYNTAX: INSN: +SYNTAX: \INSN: scan-new-class insn-word ";" parse-tokens define-insn ; -SYNTAX: VREG-INSN: +SYNTAX: \VREG-INSN: scan-new-class vreg-insn-word ";" parse-tokens define-insn ; -SYNTAX: FLUSHABLE-INSN: +SYNTAX: \FLUSHABLE-INSN: scan-new-class flushable-insn-word ";" parse-tokens define-insn ; -SYNTAX: FOLDABLE-INSN: +SYNTAX: \FOLDABLE-INSN: scan-new-class foldable-insn-word ";" parse-tokens define-insn ; diff --git a/basis/compiler/cfg/registers/registers.factor b/basis/compiler/cfg/registers/registers.factor index c988bf7c9c..516b91d7f3 100644 --- a/basis/compiler/cfg/registers/registers.factor +++ b/basis/compiler/cfg/registers/registers.factor @@ -32,5 +32,5 @@ C: ds-loc TUPLE: rs-loc < loc ; C: rs-loc -SYNTAX: d: scan-number suffix! ; -SYNTAX: r: scan-number suffix! ; +SYNTAX: \d: scan-number suffix! ; +SYNTAX: \r: scan-number suffix! ; diff --git a/basis/compiler/cfg/renaming/functor/functor.factor b/basis/compiler/cfg/renaming/functor/functor.factor index 06b827699f..4331b07afc 100644 --- a/basis/compiler/cfg/renaming/functor/functor.factor +++ b/basis/compiler/cfg/renaming/functor/functor.factor @@ -85,4 +85,4 @@ insn-classes get [ insn-temp-slots empty? ] reject [ ;FUNCTOR> -SYNTAX: RENAMING: scan-token scan-object scan-object scan-object define-renaming ; +SYNTAX: \RENAMING: scan-token scan-object scan-object scan-object define-renaming ; diff --git a/basis/compiler/codegen/codegen.factor b/basis/compiler/codegen/codegen.factor index 247898a9b5..c3fca09259 100755 --- a/basis/compiler/codegen/codegen.factor +++ b/basis/compiler/codegen/codegen.factor @@ -117,7 +117,7 @@ M: ##epilogue generate-insn [ insn-slot-quot ] map cleave>quot ] dip suffix ; -SYNTAX: CODEGEN: +SYNTAX: \CODEGEN: scan-word [ \ generate-insn create-method-in ] keep scan-word codegen-method-body define ; @@ -268,7 +268,7 @@ CODEGEN: ##reload %reload ! Conditional branches << -SYNTAX: CONDITIONAL: +SYNTAX: \CONDITIONAL: scan-word [ \ generate-conditional-insn create-method-in ] keep scan-word codegen-method-body define ; diff --git a/basis/core-foundation/strings/strings.factor b/basis/core-foundation/strings/strings.factor index 9e239f6867..a48ae31bb6 100644 --- a/basis/core-foundation/strings/strings.factor +++ b/basis/core-foundation/strings/strings.factor @@ -98,7 +98,7 @@ FUNCTION: CFStringRef CFCopyTypeIDDescription ( CFTypeID type_id ) : CFType>description ( cf -- description ) CFGetTypeID [ CFCopyTypeIDDescription &CFRelease CF>string ] with-destructors ; -SYNTAX: CFSTRING: +SYNTAX: \CFSTRING: scan-new-word scan-object [ drop ] [ '[ _ [ _ ] initialize-alien ] ] 2bi ( -- alien ) define-declared ; diff --git a/basis/cpu/x86/assembler/syntax/syntax.factor b/basis/cpu/x86/assembler/syntax/syntax.factor index fad4e14768..39ef087c7b 100644 --- a/basis/cpu/x86/assembler/syntax/syntax.factor +++ b/basis/cpu/x86/assembler/syntax/syntax.factor @@ -22,8 +22,8 @@ registers [ H{ } clone ] initialize : define-registers ( names size -- ) [ [ 0 ] dip (define-registers) ] keep registers get set-at ; -SYNTAX: REGISTERS: +SYNTAX: \REGISTERS: scan-number [ ";" parse-tokens ] dip define-registers ; -SYNTAX: HI-REGISTERS: +SYNTAX: \HI-REGISTERS: scan-number [ ";" parse-tokens 4 ] dip (define-registers) drop ; diff --git a/basis/definitions/icons/icons.factor b/basis/definitions/icons/icons.factor index 1e5a0037be..431973b6f4 100644 --- a/basis/definitions/icons/icons.factor +++ b/basis/definitions/icons/icons.factor @@ -24,7 +24,7 @@ icons [ H{ } clone ] initialize define ] 2bi ; -SYNTAX: ICON: scan-word scan-token define-icon ; +SYNTAX: \ICON: scan-word scan-token define-icon ; >> diff --git a/basis/delegate/delegate.factor b/basis/delegate/delegate.factor index 06d5283224..7769729508 100644 --- a/basis/delegate/delegate.factor +++ b/basis/delegate/delegate.factor @@ -109,11 +109,11 @@ PRIVATE> : define-consult ( consultation -- ) [ register-consult ] [ consult-methods ] bi ; -SYNTAX: CONSULT: +SYNTAX: \CONSULT: scan-word scan-word parse-definition [ save-location ] [ define-consult ] bi ; -SYNTAX: BROADCAST: +SYNTAX: \BROADCAST: scan-word scan-word parse-definition [ save-location ] [ define-consult ] bi ; @@ -176,7 +176,7 @@ PRIVATE> [ initialize-protocol-props ] 2tri ] 2bi ; -SYNTAX: PROTOCOL: +SYNTAX: \PROTOCOL: scan-new-word parse-definition define-protocol ; PREDICATE: protocol < word protocol-words ; ! Subclass of symbol? @@ -190,7 +190,7 @@ M: protocol definer drop \ PROTOCOL: \ ; ; M: protocol group-words protocol-words ; -SYNTAX: SLOT-PROTOCOL: +SYNTAX: \SLOT-PROTOCOL: scan-new-word ";" [ [ reader-word ] [ writer-word ] bi 2array ] map-tokens concat define-protocol ; diff --git a/basis/functors/functors.factor b/basis/functors/functors.factor index e9a06e1b8c..33709a6ff3 100644 --- a/basis/functors/functors.factor +++ b/basis/functors/functors.factor @@ -82,7 +82,7 @@ FUNCTOR-SYNTAX: \M: parse-definition* \ define* suffix! ; -FUNCTOR-SYNTAX: C: +FUNCTOR-SYNTAX: \C: scan-param suffix! scan-param [ suffix! @@ -90,31 +90,31 @@ FUNCTOR-SYNTAX: C: ] keep suffix! \ boa-effect suffix! \ define-declared* suffix! ; -FUNCTOR-SYNTAX: : +FUNCTOR-SYNTAX: \: scan-param suffix! parse-declared* \ define-declared* suffix! ; -FUNCTOR-SYNTAX: SYMBOL: +FUNCTOR-SYNTAX: \SYMBOL: scan-param suffix! \ define-symbol suffix! ; -FUNCTOR-SYNTAX: SYNTAX: +FUNCTOR-SYNTAX: \SYNTAX: scan-param suffix! parse-definition* \ define-syntax suffix! ; -FUNCTOR-SYNTAX: INSTANCE: +FUNCTOR-SYNTAX: \INSTANCE: scan-param suffix! scan-param suffix! \ add-mixin-instance suffix! ; -FUNCTOR-SYNTAX: GENERIC: +FUNCTOR-SYNTAX: \GENERIC: scan-param suffix! scan-effect suffix! \ define-simple-generic* suffix! ; -FUNCTOR-SYNTAX: MACRO: +FUNCTOR-SYNTAX: \MACRO: scan-param suffix! parse-declared* \ define-macro suffix! ; diff --git a/basis/gobject-introspection/gobject-introspection.factor b/basis/gobject-introspection/gobject-introspection.factor index 3d380cb68b..e4672930ab 100755 --- a/basis/gobject-introspection/gobject-introspection.factor +++ b/basis/gobject-introspection/gobject-introspection.factor @@ -53,17 +53,17 @@ M: gir-not-found summary PRIVATE> -SYNTAX: GIR: scan-token define-gir-vocab ; +SYNTAX: \GIR: scan-token define-gir-vocab ; -SYNTAX: IMPLEMENT-STRUCTS: +SYNTAX: \IMPLEMENT-STRUCTS: ";" parse-tokens implement-structs [ swap append! ] change-global ; -SYNTAX: FOREIGN-ATOMIC-TYPE: +SYNTAX: \FOREIGN-ATOMIC-TYPE: scan-token scan-object swap register-atomic-type ; -SYNTAX: FOREIGN-ENUM-TYPE: +SYNTAX: \FOREIGN-ENUM-TYPE: scan-token scan-object swap register-enum-type ; -SYNTAX: FOREIGN-RECORD-TYPE: +SYNTAX: \FOREIGN-RECORD-TYPE: scan-token scan-object swap register-record-type ; diff --git a/basis/hashtables/identity/identity.factor b/basis/hashtables/identity/identity.factor index 47ea8bc749..ace006bf95 100644 --- a/basis/hashtables/identity/identity.factor +++ b/basis/hashtables/identity/identity.factor @@ -41,7 +41,7 @@ M: identity-hashtable assoc-like M: identity-hashtable new-assoc drop ; -SYNTAX: IH{ \ } [ >identity-hashtable ] parse-literal ; +SYNTAX: \IH{ \ } [ >identity-hashtable ] parse-literal ; { "hashtables.identity" "prettyprint" } "hashtables.identity.prettyprint" require-when { "hashtables.identity" "mirrors" } "hashtables.identity.mirrors" require-when diff --git a/basis/hashtables/sequences/sequences.factor b/basis/hashtables/sequences/sequences.factor index 56c6f6373a..d330a6aabf 100644 --- a/basis/hashtables/sequences/sequences.factor +++ b/basis/hashtables/sequences/sequences.factor @@ -38,6 +38,6 @@ M: sequence-hashtable clone M: sequence-hashtable new-assoc drop ; -SYNTAX: SH{ \ } [ >sequence-hashtable ] parse-literal ; +SYNTAX: \SH{ \ } [ >sequence-hashtable ] parse-literal ; { "hashtables.sequences" "prettyprint" } "hashtables.sequences.prettyprint" require-when diff --git a/basis/help/syntax/syntax.factor b/basis/help/syntax/syntax.factor index 73f72e7b22..44e2347c4a 100644 --- a/basis/help/syntax/syntax.factor +++ b/basis/help/syntax/syntax.factor @@ -4,7 +4,7 @@ USING: accessors arrays compiler.units definitions help help.topics kernel math parser sequences vocabs.parser words ; IN: help.syntax -SYNTAX: HELP: +SYNTAX: \HELP: scan-word bootstrap-word [ >link save-location ] [ [ parse-array-def ] dip set-word-help ] @@ -12,7 +12,7 @@ SYNTAX: HELP: ERROR: article-expects-name-and-title got ; -SYNTAX: ARTICLE: +SYNTAX: \ARTICLE: location [ parse-array-def dup length 2 < [ article-expects-name-and-title ] when @@ -20,5 +20,5 @@ SYNTAX: ARTICLE: over add-article >link ] dip remember-definition ; -SYNTAX: ABOUT: +SYNTAX: \ABOUT: current-vocab scan-object >>help changed-definition ; diff --git a/basis/help/tips/tips.factor b/basis/help/tips/tips.factor index 1b535d8dfa..b495bba54d 100644 --- a/basis/help/tips/tips.factor +++ b/basis/help/tips/tips.factor @@ -21,7 +21,7 @@ M: tip set-where loc<< ; : add-tip ( tip -- ) tips get push ; -SYNTAX: TIP: +SYNTAX: \TIP: parse-array-def [ save-location ] [ add-tip ] bi ; diff --git a/basis/hints/hints.factor b/basis/hints/hints.factor index 2cea955f07..ea6a432756 100644 --- a/basis/hints/hints.factor +++ b/basis/hints/hints.factor @@ -73,7 +73,7 @@ ERROR: cannot-specialize word specializer ; over inline-recursive? [ cannot-specialize ] when "specializer" set-word-prop ; -SYNTAX: HINTS: +SYNTAX: \HINTS: scan-object dup wrapper? [ wrapped>> ] when [ changed-definition ] [ subwords [ changed-definition ] each ] diff --git a/basis/html/templates/chloe/components/components.factor b/basis/html/templates/chloe/components/components.factor index d3b55852d0..9521480f3d 100644 --- a/basis/html/templates/chloe/components/components.factor +++ b/basis/html/templates/chloe/components/components.factor @@ -31,7 +31,7 @@ M: tuple-class component-tag ( tag class -- ) [ compile-component-attrs ] 2bi render-quot [code] ; -SYNTAX: COMPONENT: +SYNTAX: \COMPONENT: scan-word [ name>> ] [ '[ _ component-tag ] ] bi define-chloe-tag ; diff --git a/basis/html/templates/chloe/syntax/syntax.factor b/basis/html/templates/chloe/syntax/syntax.factor index 5d02982610..d61c09818e 100644 --- a/basis/html/templates/chloe/syntax/syntax.factor +++ b/basis/html/templates/chloe/syntax/syntax.factor @@ -13,7 +13,7 @@ tags [ H{ } clone ] initialize : define-chloe-tag ( name quot -- ) swap tags get set-at ; -SYNTAX: CHLOE: +SYNTAX: \CHLOE: scan-token parse-definition define-chloe-tag ; CONSTANT: chloe-ns "http://factorcode.org/chloe/1.0" diff --git a/basis/io/encodings/8-bit/8-bit.factor b/basis/io/encodings/8-bit/8-bit.factor index 8aeb292efe..2937923941 100644 --- a/basis/io/encodings/8-bit/8-bit.factor +++ b/basis/io/encodings/8-bit/8-bit.factor @@ -54,4 +54,4 @@ M: 8-bit-encoding PRIVATE> -SYNTAX: 8-BIT: scan-token scan-token scan-token load-encoding ; +SYNTAX: \8-BIT: scan-token scan-token scan-token load-encoding ; diff --git a/basis/io/encodings/euc/euc.factor b/basis/io/encodings/euc/euc.factor index 261c8acca4..ba41dfe107 100644 --- a/basis/io/encodings/euc/euc.factor +++ b/basis/io/encodings/euc/euc.factor @@ -63,6 +63,6 @@ SYMBOL: euc-table PRIVATE> -SYNTAX: EUC: +SYNTAX: \EUC: ! EUC: euc-kr "vocab:io/encodings/korean/cp949.txt" scan-new-class scan-object define-euc ; diff --git a/basis/locals/locals.factor b/basis/locals/locals.factor index a95de5ffea..edff52da36 100644 --- a/basis/locals/locals.factor +++ b/basis/locals/locals.factor @@ -13,15 +13,15 @@ SYNTAX: [| parse-lambda append! ; SYNTAX: [let parse-let append! ; -SYNTAX: :: (::) define-declared ; +SYNTAX: \:: (::) define-declared ; -SYNTAX: M:: (M::) define ; +SYNTAX: \M:: (M::) define ; -SYNTAX: MACRO:: (::) define-macro ; +SYNTAX: \MACRO:: (::) define-macro ; -SYNTAX: MEMO:: (::) define-memoized ; +SYNTAX: \MEMO:: (::) define-memoized ; -SYNTAX: IDENTITY-MEMO:: (::) define-identity-memoized ; +SYNTAX: \IDENTITY-MEMO:: (::) define-identity-memoized ; { "locals.macros" diff --git a/basis/logging/logging.factor b/basis/logging/logging.factor index 0ccc1b2536..3d15040dcb 100644 --- a/basis/logging/logging.factor +++ b/basis/logging/logging.factor @@ -137,7 +137,7 @@ PRIVATE> [ [ input-logging-quot ] 2keep drop error-logging-quot ] (define-logging) ; -SYNTAX: LOG: +SYNTAX: \LOG: ! Syntax: name level scan-new-word dup scan-word '[ 1array stack>message _ _ log-message ] diff --git a/basis/macros/macros.factor b/basis/macros/macros.factor index 362e02c6e7..138ca4c8c7 100644 --- a/basis/macros/macros.factor +++ b/basis/macros/macros.factor @@ -27,7 +27,7 @@ PRIVATE> [ 2drop changed-effect ] } 3cleave ; -SYNTAX: MACRO: (:) define-macro ; +SYNTAX: \MACRO: (:) define-macro ; PREDICATE: macro < word "macro" word-prop >boolean ; diff --git a/basis/match/match.factor b/basis/match/match.factor index aa68543d14..ef54f0eed2 100644 --- a/basis/match/match.factor +++ b/basis/match/match.factor @@ -17,7 +17,7 @@ SYMBOL: _ : define-match-vars ( seq -- ) [ define-match-var ] each ; -SYNTAX: MATCH-VARS: ! vars ... +SYNTAX: \MATCH-VARS: ! vars ... ";" [ define-match-var ] each-token ; PREDICATE: match-var < word "match-var" word-prop ; diff --git a/basis/math/complex/complex.factor b/basis/math/complex/complex.factor index f57523dd02..07305eef47 100644 --- a/basis/math/complex/complex.factor +++ b/basis/math/complex/complex.factor @@ -40,7 +40,7 @@ ERROR: malformed-complex obj ; : parse-complex ( seq -- complex ) dup length 2 = [ first2-unsafe rect> ] [ malformed-complex ] if ; -SYNTAX: C{ \ } [ parse-complex ] parse-literal ; +SYNTAX: \C{ \ } [ parse-complex ] parse-literal ; USE: prettyprint.custom diff --git a/basis/math/rectangles/prettyprint/prettyprint.factor b/basis/math/rectangles/prettyprint/prettyprint.factor index b1fe1789f7..68934e1284 100644 --- a/basis/math/rectangles/prettyprint/prettyprint.factor +++ b/basis/math/rectangles/prettyprint/prettyprint.factor @@ -5,7 +5,7 @@ IN: math.rectangles.prettyprint M: rect pprint* [ - \ RECT: [ + \ rect: [ [ loc>> ] [ dim>> ] bi [ pprint* ] bi@ ] pprint-prefix ] check-recursion ; diff --git a/basis/math/rectangles/rectangles-tests.factor b/basis/math/rectangles/rectangles-tests.factor index e898be4449..594f59b889 100644 --- a/basis/math/rectangles/rectangles-tests.factor +++ b/basis/math/rectangles/rectangles-tests.factor @@ -2,39 +2,39 @@ USING: tools.test math.rectangles prettyprint io.streams.string kernel accessors ; IN: math.rectangles.tests -{ RECT: { 10 10 } { 20 20 } } +{ rect: { 10 10 } { 20 20 } } [ - RECT: { 10 10 } { 50 50 } - RECT: { -10 -10 } { 40 40 } + rect: { 10 10 } { 50 50 } + rect: { -10 -10 } { 40 40 } rect-intersect ] unit-test -{ RECT: { 200 200 } { 0 0 } } +{ rect: { 200 200 } { 0 0 } } [ - RECT: { 100 100 } { 50 50 } - RECT: { 200 200 } { 40 40 } + rect: { 100 100 } { 50 50 } + rect: { 200 200 } { 40 40 } rect-intersect ] unit-test { f } [ - RECT: { 100 100 } { 50 50 } - RECT: { 200 200 } { 40 40 } + rect: { 100 100 } { 50 50 } + rect: { 200 200 } { 40 40 } contains-rect? ] unit-test { t } [ - RECT: { 100 100 } { 50 50 } - RECT: { 120 120 } { 40 40 } + rect: { 100 100 } { 50 50 } + rect: { 120 120 } { 40 40 } contains-rect? ] unit-test { f } [ - RECT: { 1000 100 } { 50 50 } - RECT: { 120 120 } { 40 40 } + rect: { 1000 100 } { 50 50 } + rect: { 120 120 } { 40 40 } contains-rect? ] unit-test -{ RECT: { 10 20 } { 20 20 } } [ +{ rect: { 10 20 } { 20 20 } } [ { { 20 20 } { 10 40 } @@ -42,5 +42,5 @@ IN: math.rectangles.tests } rect-containing ] unit-test -! Prettyprint for RECT: didn't do nesting check properly -{ } [ [ RECT: f f dup >>dim . ] with-string-writer drop ] unit-test +! Prettyprint for rect: didn't do nesting check properly +{ } [ [ rect: f f dup >>dim . ] with-string-writer drop ] unit-test diff --git a/basis/math/rectangles/rectangles.factor b/basis/math/rectangles/rectangles.factor index 8714bdfb1a..fc26dc8ce7 100644 --- a/basis/math/rectangles/rectangles.factor +++ b/basis/math/rectangles/rectangles.factor @@ -8,7 +8,7 @@ TUPLE: rect { loc initial: { 0 0 } } { dim initial: { 0 0 } } ; : ( loc dim -- rect ) rect boa ; inline -SYNTAX: RECT: scan-object scan-object suffix! ; +SYNTAX: \rect: scan-object scan-object suffix! ; : ( -- rect ) rect new ; inline diff --git a/basis/math/vectors/simd/cords/cords.factor b/basis/math/vectors/simd/cords/cords.factor index 3c360512fc..0a6615ffe1 100644 --- a/basis/math/vectors/simd/cords/cords.factor +++ b/basis/math/vectors/simd/cords/cords.factor @@ -78,7 +78,7 @@ SYNTAX: A{ \ } [ >A ] parse-literal ; [ define-specialized-cord ] [ create-word-in (define-simd-128-cord) ] 2bi ; -SYNTAX: SIMD-128-CORD: +SYNTAX: \SIMD-128-CORD: scan-word scan-token define-simd-128-cord ; PRIVATE> diff --git a/basis/math/vectors/simd/simd.factor b/basis/math/vectors/simd/simd.factor index 1edbdf03f4..23bca9b24d 100644 --- a/basis/math/vectors/simd/simd.factor +++ b/basis/math/vectors/simd/simd.factor @@ -331,7 +331,7 @@ c: ;FUNCTOR> -SYNTAX: SIMD-128: +SYNTAX: \SIMD-128: scan-token define-simd-128 ; PRIVATE> diff --git a/basis/memoize/memoize.factor b/basis/memoize/memoize.factor index bc34c481f3..76d2641ca2 100644 --- a/basis/memoize/memoize.factor +++ b/basis/memoize/memoize.factor @@ -69,9 +69,9 @@ PRIVATE> dup in>> length zero? [ f 1array ] [ IH{ } clone ] if (define-memoized) ; -SYNTAX: MEMO: (:) define-memoized ; +SYNTAX: \MEMO: (:) define-memoized ; -SYNTAX: IDENTITY-MEMO: (:) define-identity-memoized ; +SYNTAX: \IDENTITY-MEMO: (:) define-identity-memoized ; PREDICATE: memoized < word "memoize" word-prop >boolean ; diff --git a/basis/multiline/multiline-tests.factor b/basis/multiline/multiline-tests.factor index dbc2688f4e..e3679eb100 100644 --- a/basis/multiline/multiline-tests.factor +++ b/basis/multiline/multiline-tests.factor @@ -73,7 +73,7 @@ xyz /* << -SYNTAX: MULTILINE-LITERAL: parse-here suffix! ; +SYNTAX: \MULTILINE-LITERAL: parse-here suffix! ; >> { { "bar" } } diff --git a/basis/opengl/gl/extensions/extensions.factor b/basis/opengl/gl/extensions/extensions.factor index 4fbf78bac2..7409e9aca1 100644 --- a/basis/opengl/gl/extensions/extensions.factor +++ b/basis/opengl/gl/extensions/extensions.factor @@ -49,7 +49,7 @@ reset-gl-function-number-counter : gl-function-calling-convention ( -- symbol ) os windows? [ stdcall ] [ cdecl ] if ; -SYNTAX: GL-FUNCTION: +SYNTAX: \GL-FUNCTION: gl-function-calling-convention scan-function-name "{" expect "}" parse-tokens over suffix diff --git a/basis/peg/ebnf/ebnf.factor b/basis/peg/ebnf/ebnf.factor index e959b2c052..5647f78f78 100644 --- a/basis/peg/ebnf/ebnf.factor +++ b/basis/peg/ebnf/ebnf.factor @@ -537,7 +537,7 @@ ERROR: could-not-parse-ebnf ; PRIVATE> -SYNTAX: EBNF: +SYNTAX: \EBNF: reset-tokenizer scan-new-word dup scan-object ebnf>quot swapd @@ -549,13 +549,13 @@ SYNTAX: EBNF: ebnf>quot nip suffix! \ call suffix! reset-tokenizer ; -SYNTAX: EBNF[[ "]]" parse-multiline-string define-inline-ebnf ; -SYNTAX: EBNF[=[ "]=]" parse-multiline-string define-inline-ebnf ; -SYNTAX: EBNF[==[ "]==]" parse-multiline-string define-inline-ebnf ; -SYNTAX: EBNF[===[ "]===]" parse-multiline-string define-inline-ebnf ; -SYNTAX: EBNF[====[ "]====]" parse-multiline-string define-inline-ebnf ; +SYNTAX: \EBNF[[ "]]" parse-multiline-string define-inline-ebnf ; +SYNTAX: \EBNF[=[ "]=]" parse-multiline-string define-inline-ebnf ; +SYNTAX: \EBNF[==[ "]==]" parse-multiline-string define-inline-ebnf ; +SYNTAX: \EBNF[===[ "]===]" parse-multiline-string define-inline-ebnf ; +SYNTAX: \EBNF[====[ "]====]" parse-multiline-string define-inline-ebnf ; -SYNTAX: EBNF-PARSER: +SYNTAX: \EBNF-PARSER: reset-tokenizer scan-new-word scan-object parse-ebnf main of '[ _ ] diff --git a/basis/peg/peg.factor b/basis/peg/peg.factor index f0545a17a3..f6067d5c84 100644 --- a/basis/peg/peg.factor +++ b/basis/peg/peg.factor @@ -607,7 +607,7 @@ PRIVATE> ERROR: parse-failed input word ; -SYNTAX: PEG: +SYNTAX: \PEG: [let (:) :> ( word def effect ) [ diff --git a/basis/persistent/hashtables/hashtables.factor b/basis/persistent/hashtables/hashtables.factor index 64577f8ff0..9095530f7c 100644 --- a/basis/persistent/hashtables/hashtables.factor +++ b/basis/persistent/hashtables/hashtables.factor @@ -53,7 +53,7 @@ M: persistent-hash hashcode* nip assoc-size ; M: persistent-hash clone ; -SYNTAX: PH{ \ } [ >persistent-hash ] parse-literal ; +SYNTAX: \PH{ \ } [ >persistent-hash ] parse-literal ; M: persistent-hash pprint-delims drop \ PH{ \ } ; M: persistent-hash >pprint-sequence >alist ; diff --git a/basis/persistent/vectors/vectors.factor b/basis/persistent/vectors/vectors.factor index 862eed1aa9..9ece383549 100644 --- a/basis/persistent/vectors/vectors.factor +++ b/basis/persistent/vectors/vectors.factor @@ -181,7 +181,7 @@ M: persistent-vector equal? : >persistent-vector ( seq -- pvec ) T{ persistent-vector } like ; -SYNTAX: PV{ \ } [ >persistent-vector ] parse-literal ; +SYNTAX: \PV{ \ } [ >persistent-vector ] parse-literal ; M: persistent-vector pprint-delims drop \ PV{ \ } ; M: persistent-vector >pprint-sequence ; diff --git a/basis/promises/promises.factor b/basis/promises/promises.factor index 933beed336..64a5a42ced 100644 --- a/basis/promises/promises.factor +++ b/basis/promises/promises.factor @@ -17,5 +17,5 @@ TUPLE: promise quot forced? value ; : make-lazy-quot ( quot effect -- quot ) in>> length '[ _ _ ncurry ] ; -SYNTAX: LAZY: +SYNTAX: \LAZY: (:) [ make-lazy-quot ] keep define-declared ; diff --git a/basis/roman/roman.factor b/basis/roman/roman.factor index 632b5050ba..6f8ab8d5c0 100644 --- a/basis/roman/roman.factor +++ b/basis/roman/roman.factor @@ -56,7 +56,7 @@ PRIVATE> << -SYNTAX: ROMAN-OP: +SYNTAX: \ROMAN-OP: scan-word [ name>> "roman" prepend create-word-in ] keep 1quotation '[ _ binary-roman-op ] scan-effect define-declared ; @@ -69,4 +69,4 @@ ROMAN-OP: * ( x y -- z ) ROMAN-OP: /i ( x y -- z ) ROMAN-OP: /mod ( x y -- z w ) -SYNTAX: ROMAN: scan-token roman> suffix! ; +SYNTAX: \ROMAN: scan-token roman> suffix! ; diff --git a/basis/tools/test/test.factor b/basis/tools/test/test.factor index 3033a82138..2ffc043a4c 100644 --- a/basis/tools/test/test.factor +++ b/basis/tools/test/test.factor @@ -128,7 +128,7 @@ MACRO: ( word -- quot ) << -SYNTAX: TEST: +SYNTAX: \TEST: scan-token [ create-word-in ] [ "(" ")" surround search '[ _ parse-test ] ] bi diff --git a/basis/tools/walker/walker.factor b/basis/tools/walker/walker.factor index 205f9f6703..2877a376cc 100644 --- a/basis/tools/walker/walker.factor +++ b/basis/tools/walker/walker.factor @@ -169,6 +169,6 @@ IN: syntax SYNTAX: B \ break suffix! ; -SYNTAX: B: scan-word definition +SYNTAX: \b: scan-word definition [ break "now press O I to land inside the parsing word" drop ] prepose call( accum -- accum ) ; diff --git a/basis/tr/tr.factor b/basis/tr/tr.factor index 2de706bb14..63e87962d3 100644 --- a/basis/tr/tr.factor +++ b/basis/tr/tr.factor @@ -41,7 +41,7 @@ M: bad-tr summary PRIVATE> -SYNTAX: TR: +SYNTAX: \TR: scan-token parse-definition unclip-last [ unclip-last ] dip compute-tr [ check-tr ] diff --git a/basis/typed/typed.factor b/basis/typed/typed.factor index e8bdb46312..574f83c1c0 100644 --- a/basis/typed/typed.factor +++ b/basis/typed/typed.factor @@ -160,9 +160,9 @@ PRIVATE> [ drop "typed-def" set-word-prop ] [ 2drop "typed-word" word-prop set-last-word ] 3tri ; -SYNTAX: TYPED: +SYNTAX: \TYPED: (:) define-typed ; -SYNTAX: TYPED:: +SYNTAX: \TYPED:: (::) define-typed ; USE: vocabs.loader diff --git a/basis/ui/gadgets/prettyprint/prettyprint.factor b/basis/ui/gadgets/prettyprint/prettyprint.factor index 45b540994e..9e51d57386 100644 --- a/basis/ui/gadgets/prettyprint/prettyprint.factor +++ b/basis/ui/gadgets/prettyprint/prettyprint.factor @@ -3,5 +3,5 @@ USING: ui.gadgets prettyprint.backend prettyprint.custom ; IN: ui.gadgets.prettyprint -! Don't print gadgets with RECT: syntax +! Don't print gadgets with rect: syntax M: gadget pprint* pprint-tuple ; diff --git a/basis/ui/ui.factor b/basis/ui/ui.factor index 7788c67e13..b69515fb9b 100644 --- a/basis/ui/ui.factor +++ b/basis/ui/ui.factor @@ -229,13 +229,13 @@ HOOK: system-alert ui-backend ( caption text -- ) : define-window ( word attributes quot -- ) '[ [ f _ clone @ open-window ] with-ui ] ( -- ) define-declared ; -SYNTAX: WINDOW: +SYNTAX: \WINDOW: scan-new-word world-attributes parse-window-attributes parse-definition define-window ; -SYNTAX: MAIN-WINDOW: +SYNTAX: \MAIN-WINDOW: scan-new-word world-attributes parse-window-attributes parse-definition diff --git a/basis/unicode/categories/categories.factor b/basis/unicode/categories/categories.factor index 291e2d6499..a46fc657e4 100644 --- a/basis/unicode/categories/categories.factor +++ b/basis/unicode/categories/categories.factor @@ -29,6 +29,6 @@ SYMBOLS: Cn Lu Ll Lt Lm Lo Mn Mc Me Nd Nl No Pc Pd Ps Pe Pi Pf Po Sm Sc Sk So Zs PRIVATE> -SYNTAX: CATEGORY: parse-category define-category ; +SYNTAX: \CATEGORY: parse-category define-category ; -SYNTAX: CATEGORY-NOT: parse-category define-not-category ; +SYNTAX: \CATEGORY-NOT: parse-category define-not-category ; diff --git a/basis/vlists/vlists.factor b/basis/vlists/vlists.factor index b2f63c336c..daa8ded4d5 100644 --- a/basis/vlists/vlists.factor +++ b/basis/vlists/vlists.factor @@ -50,7 +50,7 @@ M: vlist like INSTANCE: vlist immutable-sequence -SYNTAX: VL{ \ } [ >vlist ] parse-literal ; +SYNTAX: \VL{ \ } [ >vlist ] parse-literal ; M: vlist pprint-delims drop \ VL{ \ } ; M: vlist >pprint-sequence ; diff --git a/basis/windows/com/syntax/syntax.factor b/basis/windows/com/syntax/syntax.factor index 4fffe99e15..86b5bdf328 100755 --- a/basis/windows/com/syntax/syntax.factor +++ b/basis/windows/com/syntax/syntax.factor @@ -82,7 +82,7 @@ ERROR: no-com-interface interface ; PRIVATE> -SYNTAX: COM-INTERFACE: +SYNTAX: \COM-INTERFACE: CREATE-C-TYPE void* over typedef scan-object find-com-interface-definition @@ -92,7 +92,7 @@ SYNTAX: COM-INTERFACE: dup save-com-interface-definition define-words-for-com-interface ; -SYNTAX: GUID: scan-token string>guid suffix! ; +SYNTAX: \GUID: scan-token string>guid suffix! ; USE: vocabs.loader diff --git a/basis/x11/syntax/syntax.factor b/basis/x11/syntax/syntax.factor index 5e368f79cb..5da8b7cafd 100644 --- a/basis/x11/syntax/syntax.factor +++ b/basis/x11/syntax/syntax.factor @@ -3,7 +3,7 @@ USING: alien.syntax alien.parser words x11.io sequences kernel ; IN: x11.syntax -SYNTAX: X-FUNCTION: +SYNTAX: \X-FUNCTION: (FUNCTION:) make-function [ \ awaken-event-loop suffix ] dip define-declared ; diff --git a/basis/xml/errors/errors.factor b/basis/xml/errors/errors.factor index 3b73e8a7a9..a653bb734a 100644 --- a/basis/xml/errors/errors.factor +++ b/basis/xml/errors/errors.factor @@ -25,7 +25,7 @@ PREDICATE: generated-xml-error < tuple class-of "xml-error-class" word-prop ; ] } 3cleave ; -SYNTAX: XML-ERROR: +SYNTAX: \XML-ERROR: parse-tuple-definition pick save-location define-xml-error-class ; diff --git a/basis/xml/syntax/syntax.factor b/basis/xml/syntax/syntax.factor index c2f5496790..da7b9417ba 100644 --- a/basis/xml/syntax/syntax.factor +++ b/basis/xml/syntax/syntax.factor @@ -27,16 +27,16 @@ M: no-tag summary PRIVATE> -SYNTAX: TAGS: +SYNTAX: \TAGS: scan-new-word scan-effect [ drop H{ } clone "xtable" set-word-prop ] [ define-tags ] 2bi ; -SYNTAX: TAG: +SYNTAX: \TAG: scan-token scan-word parse-definition define-tag ; -SYNTAX: XML-NS: +SYNTAX: \XML-NS: scan-new-word scan-token '[ f swap _ ] ( string -- name ) define-memoized ; -SYNTAX: data-map( +SYNTAX: \data-map( parse-data-map-effect \ data-map suffix! ; -SYNTAX: data-map!( +SYNTAX: \data-map!( parse-data-map-effect \ data-map! suffix! ; diff --git a/extra/alien/fortran/fortran.factor b/extra/alien/fortran/fortran.factor index c079968219..1bab4f7cd4 100755 --- a/extra/alien/fortran/fortran.factor +++ b/extra/alien/fortran/fortran.factor @@ -440,15 +440,15 @@ MACRO: fortran-invoke ( return library function parameters -- quot ) return library function parameters return [ c:void ] unless* parse-arglist [ \ fortran-invoke 5 [ ] nsequence ] dip define-declared ; -SYNTAX: SUBROUTINE: +SYNTAX: \SUBROUTINE: f current-library get scan-token ")" parse-tokens [ "()" subseq? ] reject define-fortran-function ; -SYNTAX: FUNCTION: +SYNTAX: \FUNCTION: scan-token current-library get scan-token ")" parse-tokens [ "()" subseq? ] reject define-fortran-function ; -SYNTAX: LIBRARY: +SYNTAX: \LIBRARY: scan-token [ current-library set ] [ set-fortran-abi ] bi ; diff --git a/extra/arrays/shaped/shaped.factor b/extra/arrays/shaped/shaped.factor index e02ef76edd..7268ee65f5 100644 --- a/extra/arrays/shaped/shaped.factor +++ b/extra/arrays/shaped/shaped.factor @@ -192,7 +192,7 @@ TUPLE: row-traverser shaped-array index ; GENERIC: next-index ( object -- index ) -SYNTAX: sa{ \ } [ >shaped-array ] parse-literal ; +SYNTAX: \sa{ \ } [ >shaped-array ] parse-literal ; ! M: row-array pprint* shaped-array>array pprint* ; ! M: col-array pprint* shaped-array>array flip pprint* ; diff --git a/extra/calendar/holidays/holidays.factor b/extra/calendar/holidays/holidays.factor index 273e2609a2..81ad159b8d 100644 --- a/extra/calendar/holidays/holidays.factor +++ b/extra/calendar/holidays/holidays.factor @@ -7,14 +7,14 @@ IN: calendar.holidays SINGLETONS: all world commonwealth-of-nations ; << -SYNTAX: HOLIDAY: +SYNTAX: \HOLIDAY: scan-new-word dup "holiday" word-prop [ dup H{ } clone "holiday" set-word-prop ] unless parse-definition ( timestamp/n -- timestamp ) define-declared ; -SYNTAX: HOLIDAY-NAME: +SYNTAX: \HOLIDAY-NAME: [let scan-word "holiday" word-prop :> holidays scan-word :> name scan-object :> value value name holidays set-at ] ; >> diff --git a/extra/changer/changer.factor b/extra/changer/changer.factor index 4f14da1909..b2c55d0458 100644 --- a/extra/changer/changer.factor +++ b/extra/changer/changer.factor @@ -8,4 +8,4 @@ MACRO: inline-changer ( name -- quot' ) [ "accessors" lookup-word 1quotation ] bi@ '[ over [ [ @ ] dip call ] dip swap @ ] ; -SYNTAX: change: scan-token '[ _ inline-changer ] append! ; +SYNTAX: \change: scan-token '[ _ inline-changer ] append! ; diff --git a/extra/classes/struct/vectored/vectored.factor b/extra/classes/struct/vectored/vectored.factor index 650e7e61b0..b3bbfcf5f7 100644 --- a/extra/classes/struct/vectored/vectored.factor +++ b/extra/classes/struct/vectored/vectored.factor @@ -113,5 +113,5 @@ M: T-array struct-transpose ;FUNCTOR> -SYNTAX: VECTORED-STRUCT: +SYNTAX: \VECTORED-STRUCT: scan-word define-vectored-struct ; diff --git a/extra/colors/flex-hex/flex-hex.factor b/extra/colors/flex-hex/flex-hex.factor index 56b56427f3..8f169d03e1 100644 --- a/extra/colors/flex-hex/flex-hex.factor +++ b/extra/colors/flex-hex/flex-hex.factor @@ -32,4 +32,4 @@ PRIVATE> : flex-hex>rgba ( str -- rgba ) flex-hex hex>rgba ; -SYNTAX: flexhexcolor: scan-token flex-hex>rgba suffix! ; +SYNTAX: \flexhexcolor: scan-token flex-hex>rgba suffix! ; diff --git a/extra/constructors/constructors.factor b/extra/constructors/constructors.factor index 49d9d5098c..aba04d20ad 100644 --- a/extra/constructors/constructors.factor +++ b/extra/constructors/constructors.factor @@ -47,7 +47,7 @@ ERROR: unknown-constructor-parameters class effect unknown ; scan-constructor scan-effect ensure-constructor-parameters parse-definition ; -SYNTAX: CONSTRUCTOR: +SYNTAX: \CONSTRUCTOR: parse-constructor [ [ constructor-boa-quot ] dip compose ] [ drop ] 2bi define-declared ; @@ -59,6 +59,6 @@ SYNTAX: CONSTRUCTOR: : scan-full-input-effect ( -- effect ) "(" expect scan-rest-input-effect ; -SYNTAX: SLOT-CONSTRUCTOR: +SYNTAX: \SLOT-CONSTRUCTOR: scan-new-word [ name>> "(" append create-reset ] keep '[ scan-rest-input-effect in>> _ '[ _ _ slots>boa ] append! ] define-syntax ; diff --git a/extra/cpu/8080/emulator/emulator.factor b/extra/cpu/8080/emulator/emulator.factor index 87690a843d..4b33db371a 100644 --- a/extra/cpu/8080/emulator/emulator.factor +++ b/extra/cpu/8080/emulator/emulator.factor @@ -1381,13 +1381,13 @@ SYMBOL: last-opcode dup last-instruction set-global ] dip ( cpu -- ) define-declared ; -SYNTAX: INSTRUCTION: ";" parse-tokens parse-instructions ; +SYNTAX: \INSTRUCTION: ";" parse-tokens parse-instructions ; -SYNTAX: cycles: +SYNTAX: \cycles: ! Set the number of cycles for the last instruction that was defined. scan-token string>number last-opcode get-global instruction-cycles set-nth ; -SYNTAX: opcode: +SYNTAX: \opcode: ! Set the opcode number for the last instruction that was defined. last-instruction get-global 1quotation scan-token hex> dup last-opcode set-global set-instruction ; diff --git a/extra/cpu/arm/assembler/assembler.factor b/extra/cpu/arm/assembler/assembler.factor index cd4f77ada4..941e7aed7e 100644 --- a/extra/cpu/arm/assembler/assembler.factor +++ b/extra/cpu/arm/assembler/assembler.factor @@ -11,7 +11,7 @@ SYMBOL: registers V{ } registers set-global -SYNTAX: REGISTER: +SYNTAX: \REGISTER: scan-new-word [ define-symbol ] [ registers get length "register" set-word-prop ] diff --git a/extra/cuda/syntax/syntax.factor b/extra/cuda/syntax/syntax.factor index 6c886b751e..cdf6f5d61d 100644 --- a/extra/cuda/syntax/syntax.factor +++ b/extra/cuda/syntax/syntax.factor @@ -4,15 +4,15 @@ USING: alien.parser cuda.libraries fry kernel lexer namespaces parser ; IN: cuda.syntax -SYNTAX: CUDA-LIBRARY: +SYNTAX: \CUDA-LIBRARY: scan-token scan-word scan-object '[ _ _ add-cuda-library ] [ current-cuda-library set-global ] bi ; -SYNTAX: CUDA-FUNCTION: +SYNTAX: \CUDA-FUNCTION: scan-token [ create-word-in current-cuda-library get ] keep scan-c-args define-cuda-function ; -SYNTAX: CUDA-GLOBAL: +SYNTAX: \CUDA-GLOBAL: scan-token [ create-word-in current-cuda-library get ] keep define-cuda-global ; diff --git a/extra/decimals/decimals.factor b/extra/decimals/decimals.factor index 2c3887580b..3867fbf8fd 100644 --- a/extra/decimals/decimals.factor +++ b/extra/decimals/decimals.factor @@ -19,7 +19,7 @@ C: decimal : parse-decimal ( -- decimal ) scan-token string>decimal ; -SYNTAX: decimal: parse-decimal suffix! ; +SYNTAX: \decimal: parse-decimal suffix! ; : decimal>ratio ( decimal -- ratio ) >decimal< 10^ * ; diff --git a/extra/descriptive/descriptive.factor b/extra/descriptive/descriptive.factor index 112540bc91..54e86e356b 100644 --- a/extra/descriptive/descriptive.factor +++ b/extra/descriptive/descriptive.factor @@ -35,7 +35,7 @@ PRIVATE> [ [ [ dup ] 2dip [descriptive] ] keep define-declared ] 3bi ; -SYNTAX: DESCRIPTIVE: (:) define-descriptive ; +SYNTAX: \DESCRIPTIVE: (:) define-descriptive ; PREDICATE: descriptive < word "descriptive-definition" word-prop >boolean ; @@ -45,7 +45,7 @@ M: descriptive definer drop \ DESCRIPTIVE: \ ; ; M: descriptive definition "descriptive-definition" word-prop ; -SYNTAX: DESCRIPTIVE:: (::) define-descriptive ; +SYNTAX: \DESCRIPTIVE:: (::) define-descriptive ; INTERSECTION: descriptive-lambda descriptive lambda-word ; diff --git a/extra/dice/dice.factor b/extra/dice/dice.factor index 31b3e4165e..83ff709459 100644 --- a/extra/dice/dice.factor +++ b/extra/dice/dice.factor @@ -26,4 +26,4 @@ IN: dice '[ _ _ random-roll ] ] if* ; -SYNTAX: ROLL: scan-token roll-quot append! ; +SYNTAX: \ROLL: scan-token roll-quot append! ; diff --git a/extra/game/worlds/worlds.factor b/extra/game/worlds/worlds.factor index 46b3f2c5c2..6dd5a1041d 100644 --- a/extra/game/worlds/worlds.factor +++ b/extra/game/worlds/worlds.factor @@ -79,7 +79,7 @@ M: game-world apply-world-attributes : define-attributes-word ( word tuple -- ) [ name>> "-attributes" append create-word-in ] dip define-constant ; -SYNTAX: GAME: +SYNTAX: \GAME: scan-new-word game-attributes parse-window-attributes 2dup define-attributes-word diff --git a/extra/gml/macros/macros.factor b/extra/gml/macros/macros.factor index 0f79d0d1d0..8bcd92f83b 100644 --- a/extra/gml/macros/macros.factor +++ b/extra/gml/macros/macros.factor @@ -27,7 +27,7 @@ SYMBOL: current-macro MACRO:: log-euler-op ( class def inputs -- quot ) class inputs def inputs '[ [ current-macro get [ _ boa save-euler-op ] [ _ ndrop ] if ] _ _ nbi ] ; -SYNTAX: LOG-GML: +SYNTAX: \LOG-GML: [let (GML:) :> ( word name effect def ) diff --git a/extra/gml/runtime/runtime.factor b/extra/gml/runtime/runtime.factor index 123b47475b..18dfdc9f4f 100644 --- a/extra/gml/runtime/runtime.factor +++ b/extra/gml/runtime/runtime.factor @@ -37,9 +37,9 @@ FROM: kernel.private => declare ; scan-word \ (exec) create-method-in swap call( -- quot ) [ is-gml ] prepend ; -SYNTAX: EXEC: [ parse-definition ] (EXEC:) define ; +SYNTAX: \EXEC: [ parse-definition ] (EXEC:) define ; -SYNTAX: EXEC:: [ [ parse-definition ] parse-locals-definition drop ] (EXEC:) define ; +SYNTAX: \EXEC:: [ [ parse-definition ] parse-locals-definition drop ] (EXEC:) define ; >> @@ -53,7 +53,7 @@ TUPLE: gml-exec-name < identity-tuple name ; MEMO: >gml-exec-name ( string -- name ) >gml-name \ gml-exec-name boa ; -SYNTAX: exec" lexer get skip-blank parse-string >gml-exec-name suffix! ; +SYNTAX: \exec" lexer get skip-blank parse-string >gml-exec-name suffix! ; ERROR: unbound-name { name gml-name } ; @@ -191,10 +191,10 @@ global-dictionary [ H{ } clone ] initialize : (GML:) ( -- word name effect def ) scan-gml-name scan-effect parse-definition ; -SYNTAX: GML: +SYNTAX: \GML: (GML:) define-gml-primitive ; -SYNTAX: GML:: +SYNTAX: \GML:: [let scan-gml-name :> ( word name ) word [ parse-definition ] parse-locals-definition :> ( word def effect ) diff --git a/extra/gpu/render/render.factor b/extra/gpu/render/render.factor index bc829e06e8..6523c865fd 100755 --- a/extra/gpu/render/render.factor +++ b/extra/gpu/render/render.factor @@ -536,7 +536,7 @@ PRIVATE> : define-uniform-tuple ( class superclass uniforms -- ) (define-uniform-tuple) ; inline -SYNTAX: UNIFORM-TUPLE: +SYNTAX: \UNIFORM-TUPLE: parse-uniform-tuple-definition define-uniform-tuple ; ] [ "vertex-format-attributes" set-word-prop ] 2bi ; -SYNTAX: VERTEX-FORMAT: +SYNTAX: \VERTEX-FORMAT: scan-new-class parse-definition [ first4 vertex-attribute boa ] map define-vertex-format ; @@ -361,7 +361,7 @@ SYNTAX: VERTEX-FORMAT: vertex-format-attributes [ vertex-attribute>struct-slot ] map define-struct-class ; -SYNTAX: VERTEX-STRUCT: +SYNTAX: \VERTEX-STRUCT: scan-new-class scan-word define-vertex-struct ; TUPLE: vertex-array-object < gpu-object @@ -544,9 +544,9 @@ TUPLE: feedback-format PRIVATE> -SYNTAX: feedback-format: +SYNTAX: \feedback-format: scan-object feedback-format boa suffix! ; -SYNTAX: geometry-shader-vertices-out: +SYNTAX: \geometry-shader-vertices-out: scan-object geometry-shader-vertices-out boa suffix! ; TYPED:: refresh-program ( program: program -- ) @@ -585,7 +585,7 @@ TYPED: ( program: program -- instance: program-instance ) PRIVATE> -SYNTAX: GLSL-SHADER: +SYNTAX: \GLSL-SHADER: scan-new dup dup old-instances [ scan-word @@ -597,7 +597,7 @@ SYNTAX: GLSL-SHADER: over reset-generic define-constant ; -SYNTAX: GLSL-SHADER-FILE: +SYNTAX: \GLSL-SHADER-FILE: scan-new dup dup old-instances [ scan-word execute( -- kind ) @@ -609,7 +609,7 @@ SYNTAX: GLSL-SHADER-FILE: over reset-generic define-constant ; -SYNTAX: GLSL-PROGRAM: +SYNTAX: \GLSL-PROGRAM: scan-new dup dup old-instances [ f diff --git a/extra/hash-sets/numbers/numbers.factor b/extra/hash-sets/numbers/numbers.factor index 72b313754f..cef4dbc585 100644 --- a/extra/hash-sets/numbers/numbers.factor +++ b/extra/hash-sets/numbers/numbers.factor @@ -36,6 +36,6 @@ M: number-hash-set clone : >number-hash-set ( members -- shash-set ) [ ] map >hash-set number-hash-set boa ; -SYNTAX: NHS{ \ } [ >number-hash-set ] parse-literal ; +SYNTAX: \NHS{ \ } [ >number-hash-set ] parse-literal ; { "hash-sets.numbers" "prettyprint" } "hash-sets.numbers.prettyprint" require-when diff --git a/extra/hashtables/numbers/numbers.factor b/extra/hashtables/numbers/numbers.factor index f2132da207..d8f878bf29 100644 --- a/extra/hashtables/numbers/numbers.factor +++ b/extra/hashtables/numbers/numbers.factor @@ -39,6 +39,6 @@ M: number-hashtable clone M: number-hashtable new-assoc drop ; -SYNTAX: NH{ \ } [ >number-hashtable ] parse-literal ; +SYNTAX: \NH{ \ } [ >number-hashtable ] parse-literal ; { "hashtables.numbers" "prettyprint" } "hashtables.numbers.prettyprint" require-when diff --git a/extra/infix/infix.factor b/extra/infix/infix.factor index 5de1ca52ea..4f77bf4c6e 100644 --- a/extra/infix/infix.factor +++ b/extra/infix/infix.factor @@ -139,4 +139,4 @@ SYNTAX: [infix PRIVATE> -SYNTAX: INFIX:: (INFIX::) define-declared ; +SYNTAX: \INFIX:: (INFIX::) define-declared ; diff --git a/extra/irc/messages/base/base.factor b/extra/irc/messages/base/base.factor index e2c52f32d0..32386d3c93 100644 --- a/extra/irc/messages/base/base.factor +++ b/extra/irc/messages/base/base.factor @@ -109,7 +109,7 @@ PRIVATE> ! SYNTAX: name string parameters ; ! IRC: type "COMMAND" slot1 ...; ! IRC: type "COMMAND" slot1 ... : trailing-slot; -SYNTAX: IRC: +SYNTAX: \IRC: scan-new-class [ scan-object register-irc-message-type ] keep ";" parse-tokens diff --git a/extra/math/derivatives/syntax/syntax.factor b/extra/math/derivatives/syntax/syntax.factor index b1d33a80c1..0ca6ea9871 100644 --- a/extra/math/derivatives/syntax/syntax.factor +++ b/extra/math/derivatives/syntax/syntax.factor @@ -4,6 +4,6 @@ USING: accessors effects kernel lexer math.ranges parser sequences words ; IN: math.derivatives.syntax -SYNTAX: DERIVATIVE: scan-object dup stack-effect in>> length [1,b] +SYNTAX: \DERIVATIVE: scan-object dup stack-effect in>> length [1,b] [ drop scan-object ] map ";" expect "derivative" set-word-prop ; diff --git a/extra/memory/pools/pools.factor b/extra/memory/pools/pools.factor index 5a0e084b40..68c2f8af03 100644 --- a/extra/memory/pools/pools.factor +++ b/extra/memory/pools/pools.factor @@ -49,5 +49,5 @@ PRIVATE> : free-to-pool ( object -- ) dup class-of class-pool pool-free ; -SYNTAX: POOL: +SYNTAX: \POOL: scan-word scan-word '[ _ swap ] [ swap set-class-pool ] bi ; diff --git a/extra/method-chains/method-chains.factor b/extra/method-chains/method-chains.factor index 5d24311898..defb1829f9 100644 --- a/extra/method-chains/method-chains.factor +++ b/extra/method-chains/method-chains.factor @@ -3,5 +3,5 @@ USING: kernel generic generic.parser words fry ; IN: method-chains -SYNTAX: AFTER: (M:) dupd '[ [ _ (call-next-method) ] _ bi ] define ; -SYNTAX: BEFORE: (M:) over '[ _ [ _ (call-next-method) ] bi ] define ; +SYNTAX: \AFTER: (M:) dupd '[ [ _ (call-next-method) ] _ bi ] define ; +SYNTAX: \BEFORE: (M:) over '[ _ [ _ (call-next-method) ] bi ] define ; diff --git a/extra/money/money.factor b/extra/money/money.factor index 9516b385ad..8bf71c3dac 100644 --- a/extra/money/money.factor +++ b/extra/money/money.factor @@ -31,4 +31,4 @@ ERROR: not-an-integer x ; [ dup string>number [ ] [ not-an-integer ] ?if ] bi@ ] keep length 10^ / + swap [ neg ] when ; -SYNTAX: decimal: scan-token parse-decimal suffix! ; +SYNTAX: \decimal: scan-token parse-decimal suffix! ; diff --git a/extra/mongodb/tuple/tuple.factor b/extra/mongodb/tuple/tuple.factor index 9522a19dc0..8cc5fea829 100644 --- a/extra/mongodb/tuple/tuple.factor +++ b/extra/mongodb/tuple/tuple.factor @@ -9,7 +9,7 @@ FROM: mongodb.tuple.persistent => assoc>tuple ; IN: mongodb.tuple -SYNTAX: MDBTUPLE: +SYNTAX: \MDBTUPLE: parse-tuple-definition mdb-check-slots define-tuple-class ; diff --git a/extra/multi-methods/multi-methods.factor b/extra/multi-methods/multi-methods.factor index f5637789ea..a33075bdb2 100644 --- a/extra/multi-methods/multi-methods.factor +++ b/extra/multi-methods/multi-methods.factor @@ -224,7 +224,7 @@ M: no-method error. ] if ; ! Syntax -SYNTAX: GENERIC: scan-new-word scan-effect define-generic ; +SYNTAX: \GENERIC: scan-new-word scan-effect define-generic ; : parse-method ( -- quot classes generic ) parse-definition [ 2 tail ] [ second ] [ first ] tri ; @@ -237,10 +237,10 @@ SYNTAX: GENERIC: scan-new-word scan-effect define-generic ; : (METHOD:) ( -- method def ) scan-new-method parse-definition ; -SYNTAX: METHOD: (METHOD:) define ; +SYNTAX: \METHOD: (METHOD:) define ; ! For compatibility -SYNTAX: M: +SYNTAX: \M: scan-word 1array scan-word create-method-in parse-definition define ; diff --git a/extra/opencl/syntax/syntax.factor b/extra/opencl/syntax/syntax.factor index bd9589d956..6bdf6888db 100644 --- a/extra/opencl/syntax/syntax.factor +++ b/extra/opencl/syntax/syntax.factor @@ -4,5 +4,5 @@ USING: classes.parser classes.singleton classes.union kernel lexer sequences ; IN: opencl.syntax -SYNTAX: SINGLETONS-UNION: +SYNTAX: \SINGLETONS-UNION: scan-new-class ";" parse-tokens [ create-class-in [ define-singleton-class ] keep ] map define-union-class ; diff --git a/extra/pair-methods/pair-methods.factor b/extra/pair-methods/pair-methods.factor index 13814015a8..9961b41d96 100644 --- a/extra/pair-methods/pair-methods.factor +++ b/extra/pair-methods/pair-methods.factor @@ -39,7 +39,7 @@ ERROR: no-pair-method a b generic ; : (PAIR-GENERIC:) ( -- ) scan-new-generic scan-effect define-pair-generic ; -SYNTAX: PAIR-GENERIC: (PAIR-GENERIC:) ; +SYNTAX: \PAIR-GENERIC: (PAIR-GENERIC:) ; : define-pair-method ( a b pair-generic definition -- ) [ 2array ] 2dip swap @@ -54,4 +54,4 @@ SYNTAX: PAIR-GENERIC: (PAIR-GENERIC:) ; ?swap scan-word parse-definition ] keep ?prefix-swap define-pair-method ; -SYNTAX: PAIR-M: (PAIR-M:) ; +SYNTAX: \PAIR-M: (PAIR-M:) ; diff --git a/extra/poker/poker-docs.factor b/extra/poker/poker-docs.factor index 5aeba53cf5..d81e5de436 100644 --- a/extra/poker/poker-docs.factor +++ b/extra/poker/poker-docs.factor @@ -6,7 +6,7 @@ HELP: best-holdem-hand { $description "Creates a new poker hand containing the best possible combination of the cards specified in " { $snippet "seq" } "." } { $examples { $example "USING: kernel poker prettyprint ;" - "HAND{ AS KD JC KH 2D 2S KC } best-holdem-hand drop value>hand-name ." + "hand{ AS KD JC KH 2D 2S KC } best-holdem-hand drop value>hand-name ." "\"Full House\"" } } ; diff --git a/extra/poker/poker.factor b/extra/poker/poker.factor index 863adde899..ff69e56b3b 100644 --- a/extra/poker/poker.factor +++ b/extra/poker/poker.factor @@ -225,5 +225,5 @@ ERROR: bad-suit-symbol ch ; : string>hand-name ( string -- string' ) string>value value>hand-name ; -SYNTAX: HAND{ +SYNTAX: \hand{ "}" [ card> ] map-tokens suffix! ; diff --git a/extra/project-euler/common/common.factor b/extra/project-euler/common/common.factor index 318b3aac53..b24743e495 100644 --- a/extra/project-euler/common/common.factor +++ b/extra/project-euler/common/common.factor @@ -158,7 +158,7 @@ PRIVATE> : d-transform ( triple -- new-triple ) { { -1 -2 -2 } { 2 1 2 } { 2 2 3 } } transform ; -SYNTAX: SOLUTION: +SYNTAX: \SOLUTION: scan-word [ name>> "-main" append create-word-in ] keep [ drop current-vocab main<< ] diff --git a/extra/python/syntax/syntax.factor b/extra/python/syntax/syntax.factor index fecc028a3f..71ed44007a 100644 --- a/extra/python/syntax/syntax.factor +++ b/extra/python/syntax/syntax.factor @@ -61,12 +61,12 @@ SYMBOL: current-context PRIVATE> -SYNTAX: PY-FROM: [ +SYNTAX: \PY-FROM: [ current-context get f add-function ] scan-definitions ; inline -SYNTAX: PY-QUALIFIED-FROM: [ +SYNTAX: \PY-QUALIFIED-FROM: [ current-context get t add-function ] scan-definitions ; inline -SYNTAX: PY-METHODS: [ add-method ] scan-definitions ; inline +SYNTAX: \PY-METHODS: [ add-method ] scan-definitions ; inline diff --git a/extra/qw/qw.factor b/extra/qw/qw.factor index e0ad6e0a74..f6b9295fe1 100644 --- a/extra/qw/qw.factor +++ b/extra/qw/qw.factor @@ -2,4 +2,4 @@ USING: lexer sequences parser ; IN: qw -SYNTAX: qw{ "}" parse-tokens suffix! ; +SYNTAX: \qw{ "}" parse-tokens suffix! ; diff --git a/extra/roles/roles.factor b/extra/roles/roles.factor index e32503e76b..11cd87fc4a 100644 --- a/extra/roles/roles.factor +++ b/extra/roles/roles.factor @@ -64,5 +64,5 @@ PREDICATE: role < mixin-class [ roles>slots define-tuple-class ] [ drop [ role? ] filter add-to-roles ] 3tri ; -SYNTAX: ROLE: parse-role-definition define-role ; -SYNTAX: ROLE-TUPLE: parse-role-definition define-tuple-class-with-roles ; +SYNTAX: \ROLE: parse-role-definition define-role ; +SYNTAX: \ROLE-TUPLE: parse-role-definition define-tuple-class-with-roles ; diff --git a/extra/slides/slides.factor b/extra/slides/slides.factor index 21fed8c67f..7456908a6b 100644 --- a/extra/slides/slides.factor +++ b/extra/slides/slides.factor @@ -113,7 +113,7 @@ TUPLE: slides < book ; : strip-tease ( data -- seq ) first3 2 over length [a,b] [ head 3array ] with with with map ; -SYNTAX: STRIP-TEASE: +SYNTAX: \STRIP-TEASE: parse-definition strip-tease append! ; \ slides H{ diff --git a/extra/slots/syntax/syntax.factor b/extra/slots/syntax/syntax.factor index d249ae1590..95c766234d 100755 --- a/extra/slots/syntax/syntax.factor +++ b/extra/slots/syntax/syntax.factor @@ -4,11 +4,11 @@ USING: combinators combinators.smart fry kernel lexer quotations sequences sequences.generalizations slots words ; IN: slots.syntax -SYNTAX: slots[ +SYNTAX: \slots[ "]" [ reader-word 1quotation ] map-tokens '[ _ cleave ] append! ; -SYNTAX: slots{ +SYNTAX: \slots{ "}" [ reader-word 1quotation ] map-tokens '[ [ _ cleave ] output>array ] append! ; @@ -18,23 +18,23 @@ SYNTAX: slots{ : writer-word<< ( name -- word ) ">>" prepend "accessors" lookup-word ; -SYNTAX: set-slots[ +SYNTAX: \set-slots[ "]" [ >>writer-word 1quotation ] map-tokens '[ _ spread ] append! ; -SYNTAX: set-slots{ +SYNTAX: \set-slots{ "}" [ >>writer-word 1quotation ] map-tokens [ length ] [ ] bi '[ _ firstn _ spread ] append! ; -SYNTAX: copy-slots{ +SYNTAX: \copy-slots{ "}" [ [ reader-word 1quotation ] [ writer-word<< 1quotation ] bi append ] map-tokens '[ swap _ cleave ] append! ; -SYNTAX: get[ postpone: slots[ ; -SYNTAX: get{ postpone: slots{ ; -SYNTAX: set[ postpone: set-slots[ ; -SYNTAX: set{ postpone: set-slots{ ; +SYNTAX: \get[ postpone: slots[ ; +SYNTAX: \get{ postpone: slots{ ; +SYNTAX: \set[ postpone: set-slots[ ; +SYNTAX: \set{ postpone: set-slots{ ; diff --git a/extra/smalltalk/selectors/selectors.factor b/extra/smalltalk/selectors/selectors.factor index b1981817d4..c3882cd7c3 100644 --- a/extra/smalltalk/selectors/selectors.factor +++ b/extra/smalltalk/selectors/selectors.factor @@ -25,4 +25,4 @@ SYMBOLS: unary binary keyword ; [ selector>effect ] bi define-simple-generic ; -SYNTAX: SELECTOR: scan-token selector>generic drop ; +SYNTAX: \SELECTOR: scan-token selector>generic drop ; diff --git a/extra/trees/avl/avl.factor b/extra/trees/avl/avl.factor index 7897b6dbe1..b06edfd327 100644 --- a/extra/trees/avl/avl.factor +++ b/extra/trees/avl/avl.factor @@ -161,7 +161,7 @@ PRIVATE> M: avl assoc-like drop dup avl? [ >avl ] unless ; -SYNTAX: AVL{ +SYNTAX: \AVL{ \ } [ >avl ] parse-literal ; M: avl pprint-delims drop \ AVL{ \ } ; diff --git a/extra/trees/splay/splay.factor b/extra/trees/splay/splay.factor index 03ca7aa85d..bbeca445c4 100644 --- a/extra/trees/splay/splay.factor +++ b/extra/trees/splay/splay.factor @@ -139,7 +139,7 @@ PRIVATE> : >splay ( assoc -- tree ) T{ splay f f 0 } assoc-clone-like ; -SYNTAX: SPLAY{ +SYNTAX: \SPLAY{ \ } [ >splay ] parse-literal ; M: splay assoc-like diff --git a/extra/trees/trees.factor b/extra/trees/trees.factor index 905ed6d9f1..b8b3343bd7 100644 --- a/extra/trees/trees.factor +++ b/extra/trees/trees.factor @@ -409,7 +409,7 @@ PRIVATE> : >tree ( assoc -- tree ) T{ tree f f 0 } assoc-clone-like ; -SYNTAX: TREE{ +SYNTAX: \TREE{ \ } [ >tree ] parse-literal ; money ( n -- string ) 3 10 { "" "K" "M" "B" "T" } reduce-magnitude ; -SYNTAX: STORAGE: scan-token storage>n suffix! ; +SYNTAX: \STORAGE: scan-token storage>n suffix! ; diff --git a/extra/variables/variables.factor b/extra/variables/variables.factor index abd2322d48..a0e2e332c8 100644 --- a/extra/variables/variables.factor +++ b/extra/variables/variables.factor @@ -14,7 +14,7 @@ GENERIC: variable-setter ( word -- word' ) M: variable variable-setter "variable-setter" word-prop ; M: local-reader variable-setter "local-writer" word-prop ; -SYNTAX: set: +SYNTAX: \set: scan-object variable-setter suffix! ; : [variable-getter] ( variable -- quot ) @@ -34,7 +34,7 @@ SYNTAX: set: : define-variable ( word -- ) dup [ [variable-getter] ] [ [variable-setter] ] bi (define-variable) ; -SYNTAX: VAR: +SYNTAX: \VAR: scan-new-word define-variable ; M: variable definer drop \ VAR: f ; @@ -58,7 +58,7 @@ PREDICATE: typed-variable < variable [ initial-value drop swap set-global ] } 2cleave (define-variable) ; -SYNTAX: TYPED-VAR: +SYNTAX: \TYPED-VAR: scan-new-word scan-object define-typed-variable ; M: typed-variable definer drop \ TYPED-VAR: f ; @@ -77,7 +77,7 @@ PREDICATE: global-variable < variable : define-global ( word -- ) global-box new [ [global-getter] ] [ [global-setter] ] bi (define-variable) ; -SYNTAX: GLOBAL: +SYNTAX: \GLOBAL: scan-new-word define-global ; M: global-variable definer drop \ GLOBAL: f ; @@ -91,7 +91,7 @@ INTERSECTION: typed-global-variable [ [ [global-getter] ] dip [typed-getter] ] [ [ [global-setter] ] dip [typed-setter] ] 2bi (define-variable) ; -SYNTAX: TYPED-GLOBAL: +SYNTAX: \TYPED-GLOBAL: scan-new-word scan-object define-typed-global ; M: typed-global-variable definer drop \ TYPED-GLOBAL: f ; diff --git a/extra/variants/variants.factor b/extra/variants/variants.factor index b153e649aa..7b1075fa4c 100644 --- a/extra/variants/variants.factor +++ b/extra/variants/variants.factor @@ -42,12 +42,12 @@ M: variant-class initial-value* [ scan-token dup ";" = not ] [ parse-variant-member ] produce nip ; -SYNTAX: VARIANT: +SYNTAX: \VARIANT: scan-new-class parse-variant-members define-variant-class-members ; -SYNTAX: VARIANT-MEMBER: +SYNTAX: \VARIANT-MEMBER: scan-word scan-token parse-variant-member define-variant-class-member ";" expect ; diff --git a/extra/vocabs/git/git.factor b/extra/vocabs/git/git.factor index 8e1c30fae3..02ebef9c47 100644 --- a/extra/vocabs/git/git.factor +++ b/extra/vocabs/git/git.factor @@ -25,4 +25,4 @@ ERROR: git-revision-not-found path ; [ [ input-stream get swap parse-stream call( -- ) ] with-git-object-stream ] [ git-revision-not-found ] if* ; -SYNTAX: USE-REV: scan-token scan-token use-vocab-rev ; +SYNTAX: \USE-REV: scan-token scan-token use-vocab-rev ; diff --git a/extra/xkcd/xkcd.factor b/extra/xkcd/xkcd.factor index 162945809a..0859494000 100644 --- a/extra/xkcd/xkcd.factor +++ b/extra/xkcd/xkcd.factor @@ -50,6 +50,6 @@ TUPLE: xkcd number image ; C: xkcd -SYNTAX: XKCD: scan-number dup xkcd-image suffix! ; +SYNTAX: \xkcd: scan-number dup xkcd-image suffix! ; M: xkcd pprint* image>> add-section ;