From c706bdae4e5c1de1610832ed39cb808bd1d8ffa3 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Thu, 1 Jun 2017 14:05:15 -0500
Subject: [PATCH] factor: Fix misc/ for GENERIC# -> GENERIC#: rename.

---
 misc/Factor.tmbundle/Syntaxes/Factor.tmLanguage | 2 +-
 misc/atom/grammars/factor.cson                  | 2 +-
 misc/factor.vim.fgen                            | 4 ++--
 misc/fuel/factor-mode.el                        | 4 ++--
 misc/vim/syntax/factor.vim                      | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/misc/Factor.tmbundle/Syntaxes/Factor.tmLanguage b/misc/Factor.tmbundle/Syntaxes/Factor.tmLanguage
index d9e9d9967c..b2cb895aac 100644
--- a/misc/Factor.tmbundle/Syntaxes/Factor.tmLanguage
+++ b/misc/Factor.tmbundle/Syntaxes/Factor.tmLanguage
@@ -138,7 +138,7 @@
 				</dict>
 			</dict>
 			<key>match</key>
-			<string>(^|(?&lt;=\s))(GENERIC#)\s+([^\s]+)\s(\d+)\s</string>
+			<string>(^|(?&lt;=\s))(GENERIC#:)\s+([^\s]+)\s(\d+)\s</string>
 			<key>name</key>
 			<string>definition.word.generic.factor</string>
 		</dict>
diff --git a/misc/atom/grammars/factor.cson b/misc/atom/grammars/factor.cson
index 7342cc0124..e8b4fc25a6 100644
--- a/misc/atom/grammars/factor.cson
+++ b/misc/atom/grammars/factor.cson
@@ -60,7 +60,7 @@ patterns: [
         name: "entity.name.generic.factor"
       "5":
         name: "comment.stack-effect.factor"
-    match: "(^|(?<=\\s))(GENERIC#)\\s+([^\\s]+)\\s(\\d+)\\s"
+    match: "(^|(?<=\\s))(GENERIC#:)\\s+([^\\s]+)\\s(\\d+)\\s"
     name: "definition.word.generic.factor"
   }
   {
diff --git a/misc/factor.vim.fgen b/misc/factor.vim.fgen
index 56bfb6a3fe..87a7ba1de7 100644
--- a/misc/factor.vim.fgen
+++ b/misc/factor.vim.fgen
@@ -45,12 +45,12 @@ syn cluster factorDefnContents contains=@factorCluster,factorStackEffect,factorL
 syn region factorDefn matchgroup=factorDefnDelims start=/\<\(SYNTAX\|\(MACRO\|MEMO\|TYPED\)\?:\?\):\s\+\S\+\>/ end=/\<;\>/ contains=@factorDefnContents
 syn region factorMethod matchgroup=factorMethodDelims start=/\<M::\?\s\+\S\+\s\+\S\+\>/ end=/\<;\>/ contains=@factorDefnContents
 syn region factorGeneric matchgroup=factorGenericDelims start=/\<\(GENERIC\|MATH\|PRIMITIVE\):\s\+\S\+\>/ end=/$/ contains=factorStackEffect
-syn region factorGenericN matchgroup=factorGenericNDelims start=/\<GENERIC#\s\+\S\+\s\+\d\+\>/ end=/$/ contains=factorStackEffect
+syn region factorGenericN matchgroup=factorGenericNDelims start=/\<GENERIC#:\s\+\S\+\s\+\d\+\>/ end=/$/ contains=factorStackEffect
 
 syn region factorPrivateDefn matchgroup=factorPrivateDefnDelims start=/\<\(SYNTAX\|\(MACRO\|MEMO\|TYPED\)\?:\?\):\s\+\S\+\>/ end=/\<;\>/ contains=@factorDefnContents contained
 syn region factorPrivateMethod matchgroup=factorPrivateMethodDelims start=/\<M::\?\s\+\S\+\s\+\S\+\>/ end=/\<;\>/ contains=@factorDefnContents contained
 syn region factorPGeneric matchgroup=factorPGenericDelims start=/\<\(GENERIC\|MATH\|PRIMITIVE\):\s\+\S\+\>/ end=/$/ contains=factorStackEffect contained
-syn region factorPGenericN matchgroup=factorPGenericNDelims start=/\<GENERIC#\s\+\S\+\s\+\d\+\>/ end=/$/ contains=factorStackEffect contained
+syn region factorPGenericN matchgroup=factorPGenericNDelims start=/\<GENERIC#:\s\+\S\+\s\+\d\+\>/ end=/$/ contains=factorStackEffect contained
 
 syn region None matchgroup=factorPrivate start=/\<<PRIVATE\>/ end=/\<PRIVATE>\>/ contains=@factorDefnContents,factorPrivateDefn,factorPrivateMethod,factorPGeneric,factorPGenericN
 
diff --git a/misc/fuel/factor-mode.el b/misc/fuel/factor-mode.el
index 436f1405e1..8eac0d4fc0 100644
--- a/misc/fuel/factor-mode.el
+++ b/misc/fuel/factor-mode.el
@@ -279,7 +279,7 @@ these lines in your .emacs:
 (defconst factor-word-definition-regex
   (concat
    (one-symbol (regexp-opt
-                '(":" "::" "GENERIC:" "GENERIC#" "DEFER:" "HOOK:"
+                '(":" "::" "GENERIC:" "GENERIC#:" "DEFER:" "HOOK:"
                   "IDENTITY-MEMO:" "MACRO:" "MACRO::" "MATH:" "MEMO:" "MEMO::"
                   "POSTPONE:" "PRIMITIVE:" "SYNTAX:" "TYPED:" "TYPED::")))
    ws+ symbol))
@@ -343,7 +343,7 @@ these lines in your .emacs:
                 "CONSTANT:" "C-GLOBAL:" "C-TYPE:"
                 "DEFER:" "DESTRUCTOR:"
                 "FORGET:"
-                "GAME:" "GENERIC:" "GENERIC#" "GLSL-PROGRAM:"
+                "GAME:" "GENERIC:" "GENERIC#:" "GLSL-PROGRAM:"
                 "HOOK:"
                 "IN:" "INSTANCE:"
                 "LIBRARY:"
diff --git a/misc/vim/syntax/factor.vim b/misc/vim/syntax/factor.vim
index 1ba3abfaca..1a8328fa48 100644
--- a/misc/vim/syntax/factor.vim
+++ b/misc/vim/syntax/factor.vim
@@ -35,12 +35,12 @@ syn cluster factorDefnContents contains=@factorCluster,factorStackEffect,factorL
 syn region factorDefn matchgroup=factorDefnDelims start=/\<\(SYNTAX\|\(MACRO\|MEMO\|TYPED\)\?:\?\):\s\+\S\+\>/ end=/\<;\>/ contains=@factorDefnContents
 syn region factorMethod matchgroup=factorMethodDelims start=/\<M::\?\s\+\S\+\s\+\S\+\>/ end=/\<;\>/ contains=@factorDefnContents
 syn region factorGeneric matchgroup=factorGenericDelims start=/\<\(GENERIC\|MATH\|PRIMITIVE\):\s\+\S\+\>/ end=/$/ contains=factorStackEffect
-syn region factorGenericN matchgroup=factorGenericNDelims start=/\<GENERIC#\s\+\S\+\s\+\d\+\>/ end=/$/ contains=factorStackEffect
+syn region factorGenericN matchgroup=factorGenericNDelims start=/\<GENERIC#:\s\+\S\+\s\+\d\+\>/ end=/$/ contains=factorStackEffect
 
 syn region factorPrivateDefn matchgroup=factorPrivateDefnDelims start=/\<\(SYNTAX\|\(MACRO\|MEMO\|TYPED\)\?:\?\):\s\+\S\+\>/ end=/\<;\>/ contains=@factorDefnContents contained
 syn region factorPrivateMethod matchgroup=factorPrivateMethodDelims start=/\<M::\?\s\+\S\+\s\+\S\+\>/ end=/\<;\>/ contains=@factorDefnContents contained
 syn region factorPGeneric matchgroup=factorPGenericDelims start=/\<\(GENERIC\|MATH\|PRIMITIVE\):\s\+\S\+\>/ end=/$/ contains=factorStackEffect contained
-syn region factorPGenericN matchgroup=factorPGenericNDelims start=/\<GENERIC#\s\+\S\+\s\+\d\+\>/ end=/$/ contains=factorStackEffect contained
+syn region factorPGenericN matchgroup=factorPGenericNDelims start=/\<GENERIC#:\s\+\S\+\s\+\d\+\>/ end=/$/ contains=factorStackEffect contained
 
 syn region None matchgroup=factorPrivate start=/\<<PRIVATE\>/ end=/\<PRIVATE>\>/ contains=@factorDefnContents,factorPrivateDefn,factorPrivateMethod,factorPGeneric,factorPGenericN