Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

merge conflict resolution.

  • Loading branch information...
commit 28d6a2cc6687ab15830d022f46485d1725a7ca5b 2 parents a0f7fd1 + d3f2826
jeffbuttars authored August 22, 2012

Showing 1 changed file with 9 additions and 2 deletions. Show diff stats Hide diff stats

  1. 11  syntax/ecl.vim
11  syntax/ecl.vim
@@ -11,8 +11,7 @@ syn match eclType /\<UNSIGNED\d*\>/
11 11
 syn match eclType '\<INTEGER\d*\>'
12 12
 syn match eclType '\<Q\?STRING\d*\>'
13 13
 syn match eclType '\<RECORD\>'
14  
-syn match eclType '\<INDEX\>'
15  
-syn match eclType '\<MACRO\>'
  14
+syn match eclType '\<BOOLEAN\>'
16 15
 syn match eclType '\<DATASET\>'
17 16
 
18 17
 syn match eclConstant '\<LEFT\>'
@@ -22,6 +21,11 @@ syn match eclBoolean '\<FALSE\>'
22 21
 
23 22
 syn match eclFunction /\<SEQUENTIAL\>/
24 23
 syn match eclFunction /\<APPLY\>/
  24
+syn match eclMacro '\<MACRO\>'
  25
+syn match eclMacro '\<FUNCTIONMACRO\>'
  26
+
  27
+syn match eclFunction '\<INDEX\>'
  28
+syn match eclFunction '\<BUILDINDEX\>'
25 29
 syn match eclFunction '\<XML\>\c'
26 30
 syn match eclFunction '\<XPATH\>\c'
27 31
 syn match eclFunction '\<XMLTEXT\>\c'
@@ -45,6 +49,7 @@ syn match	eclImport   display "^\s*IMPORT\s\+\a\w*\c"
45 49
 syn match	eclImport   display "MODULE\c"
46 50
 
47 51
 syn match	eclOperator   display "\<+\>\c"
  52
+syn match	eclOperator   display "RETURN\c"
48 53
 
49 54
 syn keyword	eclTodo		contained TODO FIXME XXX
50 55
 :syntax match eclComment /\/\/.*/ contains=eclTodo
@@ -57,6 +62,7 @@ syntax region eclModBlock start=/\<MODULE\>/ end=/\<END\>\s*;/ contains=ALL
57 62
 syntax region eclTransBlock start=/\<TRANSFORM\>/ end=/\<END\>\s*;/ contains=ALL
58 63
 syntax region eclFuncBlock start=/\<FUNCTION\>/ end=/\<END\>\s*;/ contains=ALL
59 64
 syntax region eclMacroBlock start=/\<MACRO\>/ end=/\<ENDMACRO\>\s*;/ contains=ALL
  65
+syntax region eclFuncMacroBlock start=/\<FUNCTIONMACRO\>/ end=/\<ENDMACRO\>\s*;/ contains=ALL
60 66
 
61 67
 hi def link eclCommentL		eclComment
62 68
 hi def link eclCommentStart	eclComment
@@ -86,6 +92,7 @@ hi def link eclStructure		Structure
86 92
 hi def link eclStorageClass	StorageClass
87 93
 hi def link eclImport		Include
88 94
 hi def link eclPreProc		PreProc
  95
+hi def link eclMacro	    Define
89 96
 hi def link eclDefine	    Define
90 97
 " hi def link eclDefine		Macro
91 98
 " hi def link eclIncluded		cString

0 notes on commit 28d6a2c

Please sign in to comment.
Something went wrong with that request. Please try again.