From d5bc63140197d068c68d1665c6eebb188efddba2 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sun, 5 Jun 2016 12:51:58 -0700 Subject: [PATCH] factor: more syntax work. --- .../dataflow-analysis-docs.factor | 8 ++--- .../dataflow-analysis.factor | 4 +-- language/compiler/cfg/gvn/avail/avail.factor | 2 +- .../compiler/cfg/registers/registers.factor | 4 +-- .../compiler/cfg/stacks/global/global.factor | 10 +++--- .../cfg/stacks/padding/padding.factor | 2 +- language/cpu/arm/assembler/assembler.factor | 34 +++++++++---------- language/debugger/windows/windows.factor | 2 +- language/definitions/icons/icons.factor | 28 +++++++-------- language/io/encodings/big5/big5.factor | 2 +- language/io/encodings/euc-jp/euc-jp.factor | 2 +- language/io/encodings/euc-kr/euc-kr.factor | 2 +- language/io/encodings/euc/euc.factor | 4 +-- language/io/encodings/iso2022/iso2022.factor | 10 +++--- language/io/encodings/johab/johab.factor | 2 +- language/io/files/info/windows/windows.factor | 2 +- language/io/files/windows/windows.factor | 4 +-- .../parser-combinators/simple/simple.factor | 6 ++-- language/peg/parsers/parsers.factor | 6 ++-- 19 files changed, 67 insertions(+), 67 deletions(-) diff --git a/language/compiler/cfg/dataflow-analysis/dataflow-analysis-docs.factor b/language/compiler/cfg/dataflow-analysis/dataflow-analysis-docs.factor index 617817bb45..9068596dd3 100644 --- a/language/compiler/cfg/dataflow-analysis/dataflow-analysis-docs.factor +++ b/language/compiler/cfg/dataflow-analysis/dataflow-analysis-docs.factor @@ -42,12 +42,12 @@ HELP: run-dataflow-analysis PRIVATE> -HELP: FORWARD-ANALYSIS: -{ $syntax "FORWARD-ANALYSIS: word" } +HELP: forward-analysis: +{ $syntax "forward-analysis: word" } { $values { "word" "name of the compiler pass" } } { $description "Syntax word for defining a forward analysis compiler pass." } ; -HELP: BACKWARD-ANALYSIS: -{ $syntax "BACKWARD-ANALYSIS: word" } +HELP: backward-analysis: +{ $syntax "backward-analysis: word" } { $values { "word" "name of the compiler pass" } } { $description "Syntax word for defining a backward analysis compiler pass." } ; diff --git a/language/compiler/cfg/dataflow-analysis/dataflow-analysis.factor b/language/compiler/cfg/dataflow-analysis/dataflow-analysis.factor index f0d66d8745..aa932e060c 100644 --- a/language/compiler/cfg/dataflow-analysis/dataflow-analysis.factor +++ b/language/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/language/compiler/cfg/gvn/avail/avail.factor b/language/compiler/cfg/gvn/avail/avail.factor index 5b11d69c48..97ed803f25 100644 --- a/language/compiler/cfg/gvn/avail/avail.factor +++ b/language/compiler/cfg/gvn/avail/avail.factor @@ -17,7 +17,7 @@ in: compiler.cfg.gvn.avail ! This doesn't propagate across "kill blocks". Not sure if ! that's right, though I may as well assume as much. -FORWARD-ANALYSIS: avail +forward-analysis: avail M: avail transfer-set drop defined assoc-union ; diff --git a/language/compiler/cfg/registers/registers.factor b/language/compiler/cfg/registers/registers.factor index 00e5f18339..78d7967946 100644 --- a/language/compiler/cfg/registers/registers.factor +++ b/language/compiler/cfg/registers/registers.factor @@ -32,7 +32,7 @@ C: ds-loc ; TUPLE: rs-loc < loc ; C: rs-loc ; +SYNTAX: D: scan-number suffix! ; SYNTAX: d: scan-number suffix! ; -SYNTAX: d: scan-number suffix! ; -SYNTAX: r: scan-number suffix! ; +SYNTAX: R: scan-number suffix! ; SYNTAX: r: scan-number suffix! ; diff --git a/language/compiler/cfg/stacks/global/global.factor b/language/compiler/cfg/stacks/global/global.factor index 6ddef959da..c788da6aea 100644 --- a/language/compiler/cfg/stacks/global/global.factor +++ b/language/compiler/cfg/stacks/global/global.factor @@ -15,29 +15,29 @@ in: compiler.cfg.stacks.global : transfer-peeked-locs ( set bb -- set' ) [ replace-set diff ] [ peek-set union ] bi ; -BACKWARD-ANALYSIS: anticip +backward-analysis: anticip M: anticip transfer-set drop transfer-peeked-locs ; M: anticip join-sets 2drop refine ; -BACKWARD-ANALYSIS: live +backward-analysis: live M: live transfer-set drop transfer-peeked-locs ; M: live join-sets 2drop combine ; -FORWARD-ANALYSIS: avail +forward-analysis: avail M: avail transfer-set drop [ peek-set ] [ replace-set ] bi union union ; M: avail join-sets 2drop refine ; -FORWARD-ANALYSIS: pending +forward-analysis: pending M: pending transfer-set drop replace-set union ; M: pending join-sets 2drop refine ; -BACKWARD-ANALYSIS: dead +backward-analysis: dead M: dead transfer-set drop [ kill-set ] [ replace-set ] bi union union ; diff --git a/language/compiler/cfg/stacks/padding/padding.factor b/language/compiler/cfg/stacks/padding/padding.factor index 5af538bbf1..eff03ea746 100644 --- a/language/compiler/cfg/stacks/padding/padding.factor +++ b/language/compiler/cfg/stacks/padding/padding.factor @@ -77,7 +77,7 @@ M: ##peek visit-insn ( state insn -- state ) M: insn visit-insn ( state insn -- state' ) drop ; -FORWARD-ANALYSIS: padding +forward-analysis: padding symbol: stack-record diff --git a/language/cpu/arm/assembler/assembler.factor b/language/cpu/arm/assembler/assembler.factor index 141d5daa02..e58b32325f 100644 --- a/language/cpu/arm/assembler/assembler.factor +++ b/language/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 ] @@ -20,22 +20,22 @@ SYNTAX: REGISTER: >> -REGISTER: R0 -REGISTER: R1 -REGISTER: R2 -REGISTER: R3 -REGISTER: R4 -REGISTER: R5 -REGISTER: R6 -REGISTER: R7 -REGISTER: R8 -REGISTER: R9 -REGISTER: R10 -REGISTER: R11 -REGISTER: R12 -REGISTER: R13 -REGISTER: R14 -REGISTER: R15 +register: R0 +register: R1 +register: R2 +register: R3 +register: R4 +register: R5 +register: R6 +register: R7 +register: R8 +register: R9 +register: R10 +register: R11 +register: R12 +register: R13 +register: R14 +register: R15 ALIAS: SL R10 ; ALIAS: FP R11 ; ALIAS: IP R12 ; ALIAS: SP R13 ; ALIAS: LR R14 ; ALIAS: PC R15 ; diff --git a/language/debugger/windows/windows.factor b/language/debugger/windows/windows.factor index 24ab242498..a054210c56 100644 --- a/language/debugger/windows/windows.factor +++ b/language/debugger/windows/windows.factor @@ -34,7 +34,7 @@ CONSTANT: seh-names { $ STATUS_FLOAT_MULTIPLE_FAULTS "STATUS_FLOAT_MULTIPLE_FAULTS" } { $ STATUS_FLOAT_MULTIPLE_TRAPS "STATUS_FLOAT_MULTIPLE_TRAPS" } { 0xe06d7363 "Visual C++ exception" } - } + } ; : seh-name. ( n -- ) seh-names at [ " (" ")" surround write ] when* ; diff --git a/language/definitions/icons/icons.factor b/language/definitions/icons/icons.factor index c81d1dde08..5fa7c051a4 100644 --- a/language/definitions/icons/icons.factor +++ b/language/definitions/icons/icons.factor @@ -24,20 +24,20 @@ icons [ H{ } clone ] initialize define ] 2bi ; -SYNTAX: ICON: scan-word scan-token define-icon ; +SYNTAX: ICON: scan-word scan-token ";" expect define-icon ; >> -ICON: predicate-class class-predicate-word -ICON: generic generic-word -ICON: macro macro-word -ICON: parsing-word parsing-word -ICON: primitive primitive-word -ICON: symbol symbol-word -ICON: constant constant-word -ICON: word normal-word -ICON: word-link word-help-article -ICON: topic help-article -ICON: runnable-vocab runnable-vocab -ICON: vocab open-vocab -ICON: vocab-link unopen-vocab +ICON: predicate-class class-predicate-word ; +ICON: generic generic-word ; +ICON: macro macro-word ; +ICON: parsing-word parsing-word ; +ICON: primitive primitive-word ; +ICON: symbol symbol-word ; +ICON: constant constant-word ; +ICON: word normal-word ; +ICON: word-link word-help-article ; +ICON: topic help-article ; +ICON: runnable-vocab runnable-vocab ; +ICON: vocab open-vocab ; +ICON: vocab-link unopen-vocab ; diff --git a/language/io/encodings/big5/big5.factor b/language/io/encodings/big5/big5.factor index 26854f677c..423bca876d 100644 --- a/language/io/encodings/big5/big5.factor +++ b/language/io/encodings/big5/big5.factor @@ -3,6 +3,6 @@ USING: io.encodings.iana io.encodings.euc ; in: io.encodings.big5 -EUC: big5 "vocab:io/encodings/big5/CP950.TXT" +EUC: big5 "vocab:io/encodings/big5/CP950.TXT" ; big5 "Big5" register-encoding diff --git a/language/io/encodings/euc-jp/euc-jp.factor b/language/io/encodings/euc-jp/euc-jp.factor index bea22c34c3..5b797f3111 100644 --- a/language/io/encodings/euc-jp/euc-jp.factor +++ b/language/io/encodings/euc-jp/euc-jp.factor @@ -3,6 +3,6 @@ USING: io.encodings.euc io.encodings.iana ; in: io.encodings.euc-jp -EUC: euc-jp "vocab:io/encodings/euc-jp/euc-jp-2000-std.txt" +EUC: euc-jp "vocab:io/encodings/euc-jp/euc-jp-2000-std.txt" ; euc-jp "Extended_UNIX_Code_Packed_Format_for_Japanese" register-encoding diff --git a/language/io/encodings/euc-kr/euc-kr.factor b/language/io/encodings/euc-kr/euc-kr.factor index ddc5dee7a5..5b17f0dbec 100644 --- a/language/io/encodings/euc-kr/euc-kr.factor +++ b/language/io/encodings/euc-kr/euc-kr.factor @@ -3,6 +3,6 @@ USING: io.encodings.iana io.encodings.euc ; in: io.encodings.euc-kr -EUC: euc-kr "vocab:io/encodings/euc-kr/data/cp949.txt" +EUC: euc-kr "vocab:io/encodings/euc-kr/data/cp949.txt" ; euc-kr "EUC-KR" register-encoding diff --git a/language/io/encodings/euc/euc.factor b/language/io/encodings/euc/euc.factor index 5975027e1d..774300ed1b 100644 --- a/language/io/encodings/euc/euc.factor +++ b/language/io/encodings/euc/euc.factor @@ -64,5 +64,5 @@ symbol: euc-table PRIVATE> SYNTAX: EUC: - ! EUC: euc-kr "vocab:io/encodings/korean/cp949.txt" - scan-new-class scan-object define-euc ; + ! EUC: euc-kr "vocab:io/encodings/korean/cp949.txt" ; + scan-new-class scan-object ";" expect define-euc ; diff --git a/language/io/encodings/iso2022/iso2022.factor b/language/io/encodings/iso2022/iso2022.factor index a234b08b6e..83318e3c56 100644 --- a/language/io/encodings/iso2022/iso2022.factor +++ b/language/io/encodings/iso2022/iso2022.factor @@ -33,10 +33,10 @@ M: iso2022 CONSTANT: ESC 0x16 ; -CONSTANT: switch-ascii B{ $ ESC char: ( char: B } ; -CONSTANT: switch-jis201 B{ $ ESC char: ( char: J } ; +CONSTANT: switch-ascii B{ $ ESC char: \( char: B } ; +CONSTANT: switch-jis201 B{ $ ESC char: \( char: J } ; CONSTANT: switch-jis208 B{ $ ESC char: $ char: B } ; -CONSTANT: switch-jis212 B{ $ ESC char: $ char: ( char: D } ; +CONSTANT: switch-jis212 B{ $ ESC char: $ char: \( char: D } ; : find-type ( char -- code type ) { @@ -62,7 +62,7 @@ M:: iso2022-state encode-char ( char stream encoding -- ) : read-escape ( stream -- type/f ) dup stream-read1 { - { char: ( [ + { char: \( [ stream-read1 { { char: B [ ascii get-global ] } { char: J [ jis201 get-global ] } @@ -73,7 +73,7 @@ M:: iso2022-state encode-char ( char stream encoding -- ) dup stream-read1 { { char: @ [ drop jis208 get-global ] } ! want: JIS X 0208-1978 { char: B [ drop jis208 get-global ] } - { char: ( [ + { char: \( [ stream-read1 char: D = jis212 get-global f ? ] } [ 2drop f ] diff --git a/language/io/encodings/johab/johab.factor b/language/io/encodings/johab/johab.factor index a2801388ad..f67eac67e9 100644 --- a/language/io/encodings/johab/johab.factor +++ b/language/io/encodings/johab/johab.factor @@ -3,4 +3,4 @@ use: io.encodings.euc in: io.encodings.johab -EUC: johab "vocab:io/encodings/johab/johab.txt" +EUC: johab "vocab:io/encodings/johab/johab.txt" ; diff --git a/language/io/files/info/windows/windows.factor b/language/io/files/info/windows/windows.factor index 945e3d410b..3b9562ebfc 100755 --- a/language/io/files/info/windows/windows.factor +++ b/language/io/files/info/windows/windows.factor @@ -150,7 +150,7 @@ ERROR: not-absolute-path ; unicode-prefix ?head drop dup { [ length 2 >= ] - [ second char: : = ] + [ second char: \: = ] [ first Letter? ] } 1&& [ 2 head "\\" append ] [ not-absolute-path ] if ; diff --git a/language/io/files/windows/windows.factor b/language/io/files/windows/windows.factor index a4834a27bf..69626ad09e 100755 --- a/language/io/files/windows/windows.factor +++ b/language/io/files/windows/windows.factor @@ -32,7 +32,7 @@ CONSTANT: share-mode FILE_SHARE_READ FILE_SHARE_WRITE FILE_SHARE_DELETE - } + } ; : default-security-attributes ( -- obj ) SECURITY_ATTRIBUTES @@ -332,7 +332,7 @@ M: windows root-directory? ( path -- ? ) { [ dup empty? ] [ drop f ] } { [ dup [ path-separator? ] all? ] [ drop t ] } { [ dup trim-tail-separators { [ length 2 = ] - [ second char: : = ] } 1&& ] [ drop t ] } + [ second char: \: = ] } 1&& ] [ drop t ] } { [ dup unicode-prefix head? ] [ trim-tail-separators length unicode-prefix length 2 + = ] } [ drop f ] diff --git a/language/parser-combinators/simple/simple.factor b/language/parser-combinators/simple/simple.factor index fe671bb452..5ccae8e3c6 100644 --- a/language/parser-combinators/simple/simple.factor +++ b/language/parser-combinators/simple/simple.factor @@ -11,9 +11,9 @@ in: parser-combinators.simple [ digit? ] satisfy <*> [ string>number ] <@ ; : string-parser ( -- parser ) - [ char: " = ] satisfy - [ char: " = not ] satisfy <*> &> - [ char: " = ] satisfy <& [ >string ] <@ ; + [ char: \" = ] satisfy + [ char: \" = not ] satisfy <*> &> + [ char: \" = ] satisfy <& [ >string ] <@ ; : bold-parser ( -- parser ) "*" token diff --git a/language/peg/parsers/parsers.factor b/language/peg/parsers/parsers.factor index 872e88397a..b666dfafcf 100644 --- a/language/peg/parsers/parsers.factor +++ b/language/peg/parsers/parsers.factor @@ -74,9 +74,9 @@ PRIVATE> : string-parser ( -- parser ) [ - [ char: " = ] satisfy hide , - [ char: " = not ] satisfy repeat0 , - [ char: " = ] satisfy hide , + [ char: \" = ] satisfy hide , + [ char: \" = not ] satisfy repeat0 , + [ char: \" = ] satisfy hide , ] seq* [ first >string ] action ; : (range-pattern) ( pattern -- string )