changed "scanf" keyword to "skip"

dahu · Jun 23, 2012 · aa417f2 · aa417f2
1 parent 0e4e953
commit aa417f2
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 33 deletions.
diff --git a/autoload/efmc.vim b/autoload/efmc.vim
@@ -10,7 +10,7 @@ let s:keywords = {
       \ 'message' : '%m',
       \ 'rest'    : '%r',
       \ 'pointer' : '%p',
-      \ 'scanf'   : '%*',
+      \ 'skip'    : '%*',
       \ 'string'  : '%s',
       \}
 
@@ -24,3 +24,17 @@ func! efmc#keyword(elems)
     return ''
   endif
 endfunc
+
+func! efmc#regex(elems)
+  return efmc#efm_escape(join(map(a:elems[1], 'v:val[1]'), ''))
+endfunc
+
+func! efmc#skip(elems)
+  "echom "keyword: " . string(a:elems)
+  return s:keywords['skip'] . a:elems[2]
+endfunc
+
+" stub this for now
+func! efmc#efm_escape(string)
+  return escape(a:string, '\')
+endfunc
diff --git a/autoload/efmcg.vimpeg b/autoload/efmcg.vimpeg
@@ -9,11 +9,15 @@
 
 efm        ::= efmline+
 efmline    ::= efmset | comment
-efmset     ::= (whitespace* ( keyword | string | regex))+ eol
+efmset     ::= (whitespace* ( skip | keyword | string | regex))+ eol
-regex      ::= '/' ( '\\\\' | '\\/' | !'/' '.' )* '/'
+regex      ::= '/' ( '\\\\' | '\\/' | !'/' '.' )* '/' -> #regex
 string     ::= "'" ( "'" "'"+ | !"'" '.' )* "'"
+skip       ::= 'skip' whitespace* regex -> #skip
 keyword    ::= '\a\+' -> #keyword
 comment    ::= '#.*' eol
 whitespace ::= ( '\s' | eol )
 eol        ::= '\n'
 eof        ::= '\_$'
+
+; [ [[], '{'], [[...], ' '], [[...], '}'] ]
+
diff --git a/test/simple_test_driver b/test/simple_test_driver
@@ -8,7 +8,7 @@ runtime autoload/efmc.vim
 let testname = expand('<sfile>:p:t:r')
 let testexpr = matchstr(testname, '^test_\d\+_\zs[^_]\+')
 exe "edit " . testname . '.in'
-exe "%s/.*/\\=string(g:efmc#parser.GetSym(testexpr).match(submatch(0))['value'])/"
+exe "%s/.*/\\=g:efmc#parser.GetSym(testexpr).match(submatch(0))['value']/"
 exe "write " . testname . ".out"
 quit!
 " vim: set ft=vim:
diff --git a/test/test_01_keyword_1.in b/test/test_01_keyword_1.in
@@ -7,5 +7,4 @@ number
 message
 rest
 pointer
-scanf
 string
diff --git a/test/test_01_keyword_1.msgout b/test/test_01_keyword_1.msgout
diff --git a/test/test_01_keyword_1.ok b/test/test_01_keyword_1.ok
@@ -1,11 +1,10 @@
-'%f'
+%f
-'%l'
+%l
-'%c'
+%c
-'%v'
+%v
-'%t'
+%t
-'%n'
+%n
-'%m'
+%m
-'%r'
+%r
-'%p'
+%p
-'%*'
+%s
-'%s'
diff --git a/test/test_01_keyword_1.out b/test/test_01_keyword_1.out
diff --git a/test/test_02_skip_1.in b/test/test_02_skip_1.in
@@ -0,0 +1 @@
+skip /[ ]/
diff --git a/test/test_02_skip_1.ok b/test/test_02_skip_1.ok
@@ -0,0 +1 @@
+%*[ ]
diff --git a/test/test_02_skip_1.vim b/test/test_02_skip_1.vim
@@ -0,0 +1 @@
+simple_test_driver