Refactor the lexer/parser to expose friendlier words for scanning tokens. The preferr...

[factor.git] / basis / windows / com / syntax / syntax.factor

diff --git a/basis/windows/com/syntax/syntax.factor b/basis/windows/com/syntax/syntax.factor
index 27105992ecaa9aa66f8f6e575ad949aba8951857..83c9b38790e317452e04f610f02b1016f6305628 100755 (executable)
--- a/basis/windows/com/syntax/syntax.factor
+++ b/basis/windows/com/syntax/syntax.factor
@@ -43,8 +43,8 @@ ERROR: no-com-interface interface ;
     <com-function-definition> ;
 
 :: (parse-com-functions) ( functions -- )
-    scan dup ";" = [ drop ] [
-        parse-c-type scan parse-pointers
+    (scan-token) dup ";" = [ drop ] [
+        parse-c-type (scan-token) parse-pointers
         (parse-com-function) functions push
         functions (parse-com-functions)
     ] if ;
@@ -86,13 +86,13 @@ SYNTAX: COM-INTERFACE:
     CREATE-C-TYPE
     void* over typedef
     scan-object find-com-interface-definition
-    scan string>guid
+    scan-token string>guid
     parse-com-functions
     <com-interface-definition>
     dup save-com-interface-definition
     define-words-for-com-interface ;
 
-SYNTAX: GUID: scan string>guid suffix! ;
+SYNTAX: GUID: scan-token string>guid suffix! ;
 
 USE: vocabs.loader