From e6aedf0d4cba53aa4aabb941cfdc8c8d4e8364ff Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Wed, 22 Jun 2016 16:04:49 -0700 Subject: [PATCH] factor: fix more syntax things --- .../persistent/hashtables/config/config.factor | 3 ++- core/modern/modern.factor | 2 +- ffi/forestdb/lib/lib.factor | 2 +- .../parser-combinators/parser-combinators.html | 4 ++-- libs/peg/javascript/tokenizer/tokenizer.factor | 18 +++++++++--------- libs/xmode/modes/factor.xml | 4 ++-- .../Factor.tmbundle/Syntaxes/Factor.tmLanguage | 2 +- misc/atom/grammars/factor.cson | 2 +- misc/factor.vim.fgen | 2 +- misc/vim/syntax/factor.vim | 2 +- webapps/webapps/wee-url/wee-url.factor | 6 +++--- 11 files changed, 24 insertions(+), 23 deletions(-) diff --git a/collections/persistent/hashtables/config/config.factor b/collections/persistent/hashtables/config/config.factor index 191970b13a..8c4101f27b 100644 --- a/collections/persistent/hashtables/config/config.factor +++ b/collections/persistent/hashtables/config/config.factor @@ -1,6 +1,7 @@ ! Copyright (C) 2008 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: layouts kernel parser math math.bitwise sequences ; +USING: layouts kernel parser math math.bitwise sequences +literals ; IN: persistent.hashtables.config CONSTANT: radix-bits $[ cell 4 = 4 5 ? ] ; diff --git a/core/modern/modern.factor b/core/modern/modern.factor index 6b93e90c3c..938102e656 100644 --- a/core/modern/modern.factor +++ b/core/modern/modern.factor @@ -506,7 +506,7 @@ COMPILE< [ [ delimiter>> ] [ generator>> 1quotation ] bi ] { } map>assoc ; COMPILE> -! 0 "HI: ;" slice-til-either -> 3 "HI: ;" "HI:" CHAR: \: +! 0 "HI: ;" slice-til-either -> 3 "HI: ;" "HI:" char: \: MACRO: rules>call-lexer ( seq -- quot: ( lexer string -- literal ) ) [ lexer-rules>delimiters ] [ diff --git a/ffi/forestdb/lib/lib.factor b/ffi/forestdb/lib/lib.factor index 4e9df344cf..f3fba7ec46 100644 --- a/ffi/forestdb/lib/lib.factor +++ b/ffi/forestdb/lib/lib.factor @@ -5,7 +5,7 @@ byte-arrays classes.struct combinators constructors continuations destructors forestdb.ffi forestdb.paths fry generalizations io.encodings.string io.encodings.utf8 io.pathnames kernel libc math namespaces sequences -strings ; +strings io.directories ; QUALIFIED: sets IN: forestdb.lib diff --git a/language/parser-combinators/parser-combinators.html b/language/parser-combinators/parser-combinators.html index 33aeaba902..11fd5c8438 100644 --- a/language/parser-combinators/parser-combinators.html +++ b/language/parser-combinators/parser-combinators.html @@ -41,8 +41,8 @@ general parsers work and the 'list of sucesses' that are returned as a result.

   (1) : char-a ( inp -- result )
-        0 over string-nth CHAR: a = [
-          1 swap string-tail CHAR: a cons unit delay lunit
+        0 over string-nth char: a = [
+          1 swap string-tail char: a cons unit delay lunit
         ] [
           drop lnil
         ] ifte ;
diff --git a/libs/peg/javascript/tokenizer/tokenizer.factor b/libs/peg/javascript/tokenizer/tokenizer.factor
index 82edc4e38f..26b5782fe6 100644
--- a/libs/peg/javascript/tokenizer/tokenizer.factor
+++ b/libs/peg/javascript/tokenizer/tokenizer.factor
@@ -48,15 +48,15 @@ Name              = !(Keyword) iName  => [[ ast-name boa ]]
 Number            =   Digits:ws '.' Digits:fs => [[ ws "." fs 3array "" concat-as string>number ast-number boa ]]
                     | Digits => [[ >string string>number ast-number boa ]]
 
-SingleEscape      =   "b"  => [[ CHAR: \b ]]
-                    | "f"  => [[ CHAR: \f ]]
-                    | "n"  => [[ CHAR: \n ]]
-                    | "r"  => [[ CHAR: \r ]]
-                    | "t"  => [[ CHAR: \t ]]
-                    | "v"  => [[ CHAR: \v ]]
-                    | "'"  => [[ CHAR: '  ]]
-                    | "\"" => [[ CHAR: "  ]]
-                    | "\\" => [[ CHAR: \\ ]]
+SingleEscape      =   "b"  => [[ char: \b ]]
+                    | "f"  => [[ char: \f ]]
+                    | "n"  => [[ char: \n ]]
+                    | "r"  => [[ char: \r ]]
+                    | "t"  => [[ char: \t ]]
+                    | "v"  => [[ char: \v ]]
+                    | "'"  => [[ char: \'  ]]
+                    | "\"" => [[ char: \"  ]]
+                    | "\\" => [[ char: \\ ]]
 HexDigit          = [0-9a-fA-F]
 HexEscape         = "x" (HexDigit HexDigit):d => [[ d hex> ]]
 UnicodeEscape     = "u" (HexDigit HexDigit HexDigit HexDigit):d => [[ d hex> ]]
diff --git a/libs/xmode/modes/factor.xml b/libs/xmode/modes/factor.xml
index 4b4abfdb43..efd5d1a65c 100644
--- a/libs/xmode/modes/factor.xml
+++ b/libs/xmode/modes/factor.xml
@@ -34,8 +34,8 @@
 			HASH_CHAR="USE:"
 			AT_WORD_START="TRUE">USE:\s+(\S+)
 		CHAR:\s+(\S+)
+			HASH_CHAR="char:"
+			AT_WORD_START="TRUE">char:\s+(\S+)
 
 		
 			( 
diff --git a/misc/Factor.tmbundle/Syntaxes/Factor.tmLanguage b/misc/Factor.tmbundle/Syntaxes/Factor.tmLanguage
index d9e9d9967c..753b6467e6 100644
--- a/misc/Factor.tmbundle/Syntaxes/Factor.tmLanguage
+++ b/misc/Factor.tmbundle/Syntaxes/Factor.tmLanguage
@@ -252,7 +252,7 @@
 		
 		
 			match
-			(^|(?<=\s))CHAR:\s+[^\s]+(\s|$)
+			(^|(?<=\s))char:\s+[^\s]+(\s|$)
 			name
 			constant.character.factor
 		
diff --git a/misc/atom/grammars/factor.cson b/misc/atom/grammars/factor.cson
index 7342cc0124..ca5624ffb8 100644
--- a/misc/atom/grammars/factor.cson
+++ b/misc/atom/grammars/factor.cson
@@ -132,7 +132,7 @@ patterns: [
     name: "constant.language.factor"
   }
   {
-    match: "(^|(?<=\\s))CHAR:\\s+[^\\s]+(\\s|$)"
+    match: "(^|(?<=\\s))char:\\s+[^\\s]+(\\s|$)"
     name: "constant.character.factor"
   }
   {
diff --git a/misc/factor.vim.fgen b/misc/factor.vim.fgen
index 56bfb6a3fe..4e06e17229 100644
--- a/misc/factor.vim.fgen
+++ b/misc/factor.vim.fgen
@@ -98,7 +98,7 @@ syn match   factorIn            /\/
 syn match   factorUse           /\/
 syn match   factorUnuse         /\/
 
-syn match   factorChar          /\/
+syn match   factorChar          /\/
 
 syn match   factorBackslash     /\<\\\>\s\+\S\+\>/
 syn match   factorMBackslash    /\\s\+\S\+\s\+\S\+\>/
diff --git a/misc/vim/syntax/factor.vim b/misc/vim/syntax/factor.vim
index 1ba3abfaca..dc69452ac8 100644
--- a/misc/vim/syntax/factor.vim
+++ b/misc/vim/syntax/factor.vim
@@ -86,7 +86,7 @@ syn match   factorIn            /\/
 syn match   factorUse           /\/
 syn match   factorUnuse         /\/
 
-syn match   factorChar          /\/
+syn match   factorChar          /\/
 
 syn match   factorBackslash     /\<\\\>\s\+\S\+\>/
 syn match   factorMBackslash    /\\s\+\S\+\s\+\S\+\>/
diff --git a/webapps/webapps/wee-url/wee-url.factor b/webapps/webapps/wee-url/wee-url.factor
index 1d9b5e211b..cbe0e4817c 100644
--- a/webapps/webapps/wee-url/wee-url.factor
+++ b/webapps/webapps/wee-url/wee-url.factor
@@ -18,9 +18,9 @@ short-url "SHORT_URLS" {
 } define-persistent
 
 : letter-bank ( -- seq )
-    CHAR: a CHAR: z [a,b]
-    CHAR: A CHAR: Z [a,b]
-    CHAR: 1 CHAR: 0 [a,b]
+    char: a char: z [a,b]
+    char: A char: Z [a,b]
+    char: 1 char: 0 [a,b]
     3append ; foldable
 
 : random-url ( -- string )