From ba4f81c5e6e0daf5f6816637a5bc2b08d4d6bd87 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sun, 26 Jun 2016 02:09:48 -0700 Subject: [PATCH] language: fix naming scheme for some SYNTAX: words. --- .../dataflow-analysis/dataflow-analysis-docs.factor | 8 ++++---- .../cfg/dataflow-analysis/dataflow-analysis.factor | 4 ++-- language/compiler/cfg/graphviz/graphviz.factor | 2 +- language/compiler/cfg/gvn/avail/avail.factor | 2 +- language/compiler/cfg/stacks/global/global.factor | 10 +++++----- language/compiler/cfg/stacks/padding/padding.factor | 2 +- language/constructors/constructors-tests.factor | 2 +- language/constructors/constructors.factor | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/language/compiler/cfg/dataflow-analysis/dataflow-analysis-docs.factor b/language/compiler/cfg/dataflow-analysis/dataflow-analysis-docs.factor index f9c2d59da6..0dc78c9c75 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 36066395b4..e9c0935caa 100644 --- a/language/compiler/cfg/dataflow-analysis/dataflow-analysis.factor +++ b/language/compiler/cfg/dataflow-analysis/dataflow-analysis.factor @@ -133,8 +133,8 @@ FUNCTOR> 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/graphviz/graphviz.factor b/language/compiler/cfg/graphviz/graphviz.factor index 59bcf8f3ba..c82c17023a 100644 --- a/language/compiler/cfg/graphviz/graphviz.factor +++ b/language/compiler/cfg/graphviz/graphviz.factor @@ -43,7 +43,7 @@ IN: compiler.cfg.graphviz : add-cfg-edges ( graph bb -- graph' ) dup successors>> [ - [ number>> ] bi@ -> + [ number>> ] bi@ --> ] with each ; : cfgviz ( cfg -- graph ) diff --git a/language/compiler/cfg/gvn/avail/avail.factor b/language/compiler/cfg/gvn/avail/avail.factor index 3ff1ffb46f..8a02f2c50c 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/stacks/global/global.factor b/language/compiler/cfg/stacks/global/global.factor index 1f625a933a..d189c7a91a 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 2185004273..f2bb40f4f6 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/constructors/constructors-tests.factor b/language/constructors/constructors-tests.factor index 96130fe614..27d85a30d3 100644 --- a/language/constructors/constructors-tests.factor +++ b/language/constructors/constructors-tests.factor @@ -50,7 +50,7 @@ TUPLE: a-monster < monster ; TUPLE: b-monster < monster ; COMPILE< -slot-constructor: a-monster +SLOT-CONSTRUCTOR: a-monster COMPILE> : ( name hp max-hp -- obj ) diff --git a/language/constructors/constructors.factor b/language/constructors/constructors.factor index df4037ad84..2d2b6a1bb8 100644 --- a/language/constructors/constructors.factor +++ b/language/constructors/constructors.factor @@ -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 ;