From 68f3ea6aa734c9e56aaf16bd09495e8a08df0c39 Mon Sep 17 00:00:00 2001
From: Bruce Hill <bruce@bruce-hill.com>
Date: Tue, 18 Dec 2018 15:33:25 -0800
Subject: [PATCH] Updated for new syntax.

---
 ftplugin/nomsu.vim |  2 +-
 indent/nomsu.vim   |  8 ++----
 syntax/nomsu.vim   | 69 +++++++++++++++++++++++++---------------------
 3 files changed, 41 insertions(+), 38 deletions(-)

diff --git a/ftplugin/nomsu.vim b/ftplugin/nomsu.vim
index f31ab8c..ce5991a 100644
--- a/ftplugin/nomsu.vim
+++ b/ftplugin/nomsu.vim
@@ -8,7 +8,7 @@ endif
 let b:did_ftplugin = 1
 
 setlocal formatoptions-=t
-setlocal iskeyword+=%
+setlocal iskeyword+=$
 setlocal cpoptions+=M
 setlocal foldmethod=indent
 setlocal formatprg=nomsu\ tools/autoformat.nom\ -
diff --git a/indent/nomsu.vim b/indent/nomsu.vim
index dfba205..222ce64 100644
--- a/indent/nomsu.vim
+++ b/indent/nomsu.vim
@@ -10,7 +10,7 @@ let b:did_indent = 1
 
 setlocal autoindent
 setlocal indentexpr=GetNomsuIndent()
-setlocal indentkeys+=.
+setlocal indentkeys+=0],0"
 
 " Only define the function once.
 if exists("*GetNomsuIndent")
@@ -24,13 +24,11 @@ function! GetNomsuIndent()
   let previous = getline(previousNum)
   let ind = indent(previousNum)
 
-  if previous =~ '{\.\.}\s*\($\|#\)' || previous =~ '(\.\.)\s*\($\|#\)' || previous =~ ':\s*\($\|#\)'
-\ || previous =~ '\[\.\.\]\s*\($\|#\)' || previous =~ '"\.\."\s*\($\|#\)'
-\ || previous =~ '#$'
+  if previous =~ '[{[(:"]\s*$' && previous !~ '^\s*#' "|| previous =~ '^\s*#'
     let ind += &tabstop
   endif
 
-  if line =~ '^\s*\.\.$'
+  if line =~ '^\s*[\])}]'
     let ind -= &tabstop
   endif
 
diff --git a/syntax/nomsu.vim b/syntax/nomsu.vim
index 2b24899..6abe883 100644
--- a/syntax/nomsu.vim
+++ b/syntax/nomsu.vim
@@ -12,24 +12,23 @@ syn sync minlines=100
 
 "hi def link nomsuInterpDelim PreProc
 hi nomsuInterpDelim ctermfg=Gray
-syn region nomsuOneLineComment start=/#/ end=/$/
-hi nomsuOneLineComment ctermfg=DarkBlue
-hi def link nomsuOneLineComment Comment
+"syn region nomsuOneLineComment start=/#/ end=/$/
+"hi nomsuOneLineComment ctermfg=DarkBlue
+"hi def link nomsuOneLineComment Comment
 syn region nomsuComment start=/\(^\z(\s*\)\)\@<=#/ skip=/\n\s*$/ end=/\n\(\z1\s\)\@!/
 hi nomsuComment ctermfg=DarkBlue
 hi def link nomsuComment Comment
 
-syn region nomsuList start=/\[/ end=/\]\|$/ contains=@nomsuAll,nomsuComma nextgroup=nomsuIndex
+syn region nomsuList start=/\[/ end=/\]/ contains=@nomsuAll
 hi nomsuList ctermfg=Blue
 
-syn region nomsuDict start=/{/ end=/}\|$/ contains=nomsuDictWordKey,nomsuComma,@nomsuAll nextgroup=nomsuIndex
+syn region nomsuDict start=/{/ end=/}/ contains=@nomsuAll
 hi nomsuDict ctermfg=Green
 
-syn region nomsuParenGroup start=/(/ end=/)\|$/ contains=@nomsuAll nextgroup=nomsuIndex
+syn region nomsuParenGroup start=/(/ end=/)/ contains=@nomsuAll
 hi nomsuParenGroup ctermfg=Yellow
 
-syn match nomsuLongTextStart /"\\$/ contained
-"hi nomsuLongTextStart ctermfg=Green
+syn match nomsuLongTextStart /"$/ contained
 hi def link nomsuLongTextStart String
 syn match nomsuTextBackslash /\\\(\\\)\@=/ nextgroup=nomsuTextEscapedBackslash contained
 hi nomsuTextBackslash ctermfg=Gray
@@ -39,48 +38,54 @@ syn match nomsuTextEscapedBackslash /./ contained
 hi nomsuTextEscapedBackslash cterm=bold ctermfg=Blue
 syn match nomsuTextEscape /\\/ nextgroup=nomsuTextEscapedChar contained
 hi nomsuTextEscape ctermfg=Gray
-syn match nomsuInterp /\\\([%[{(]\)\@=/ nextgroup=nomsuVar,nomsuList,nomsuDict,nomsuParenGroup contained
+syn match nomsuInterp /\\\([[{($:]\)\@=/ nextgroup=nomsuVar,nomsuList,nomsuDict,nomsuParenGroup,nomsuIndentedBlock contained
 hi nomsuInterp ctermfg=Gray
 syn region nomsuInterpDotDot matchgroup=nomsuInterpDelim start=/\\\s*$/ end=/\.\./ contained
 hi nomsuInterpDotDot ctermfg=Gray
-syn region nomsuIndentedInterp matchgroup=nomsuInterpDelim start=/\\\((\.\.)\|:\|\[\.\.\]\|{\.\.}\)\s*\(\n\(\s*\n\)*\z(\s*\)\)\@=/
-\            end=/\n\(\z1\)\@!\s*\.\./ contained contains=@nomsuAll
-hi nomsuIndentedInterp ctermfg=Gray
 syn region nomsuLongTextValue start=/^/ end=/$/ contained
-\           contains=nomsuIndentedInterp,nomsuInterp,nomsuInterpDotDot,nomsuTextBackslash
+\           contains=nomsuInterp,nomsuInterpDotDot,nomsuTextBackslash
 hi def link nomsuLongTextValue String
-syn region nomsuLongText start=/\(^\z(\s*\)[^\n]*\)\@<="\\$/ skip=/\n\s*$/ end=/\n\(\z1\s\)\@!/
+syn region nomsuLongText start=/\(^\z(\s*\)[^\n]*\)\@<="$/ skip=/\n\s*$/ end=/\n\(\z1\s\)\@!"\?/
 \           contains=nomsuLongTextStart,nomsuLongTextValue
 
-syn region nomsuText start=/"\(\\$\)\@!/ skip=/\\./ end=/"/ nextgroup=nomsuIndex
-\                       contains=nomsuInterp,nomsuTextEscape
+syn region nomsuText start=/"\($\)\@!/ skip=/\\./ end=/"/ contains=nomsuInterp,nomsuTextEscape
 hi def link nomsuText String
-syn match nomsuTextWord /\([a-zA-Z_]\|[^\x00-\xff]\)\([a-zA-Z0-9_]\|[^\x00-\xff]\)*/ contained nextgroup=nomsuIndex
-hi def link nomsuTextWord String
 
-syn match nomsuVar /%\(\([a-zA-Z0-9_-]\|[^\x00-\xff]\)\+\([a-zA-Z0-9_-]\|[^\x00-\xff]\)*\)\?/ nextgroup=nomsuIndex
-"syn match nomsuVar /([ ]*\([a-zA-Z_]\|[^\x00-\xff]\)\([a-zA-Z0-9_ ]\|[^\x00-\xff]\)*)/ contains=nomsuVarParens nextgroup=nomsuIndex
-"syn match nomsuVar /\$\(\([a-zA-Z0-9_-]\|[^\x00-\xff]\)\+\([a-zA-Z0-9_-]\|[^\x00-\xff]\)*\)\?/ nextgroup=nomsuIndex
+syn region nomsuIndentedBlock start=/\(^\z(\s*\)[^\n]*\)\@<=:\s*$/ skip=/\n\s*$/ end=/\n\(\z1\s\)\@!\(\s*\.\.\)\?/
+\           contains=@nomsuAll
+
+syn match nomsuVar /\$\((\([ a-zA-Z0-9_`~!@^&*_+=|<>?'/-]\|[^\x00-\xff]\)\+)\|\([a-zA-Z0-9_-]\|[^\x00-\xff]\)\+\)\?/
+\          contains=nomsuDollarSign,nomsuVarParens
 hi nomsuVar ctermfg=Cyan
 hi def link nomsuVar Identifier
 
-syn match nomsuVarParens /[()]/ contained
-hi nomsuVarParens ctermfg=DarkGray
+syn match nomsuDollarSign /\$/ contained
+hi nomsuDollarSign ctermfg=Cyan
 
-syn match nomsuIndex /\./ nextgroup=nomsuVar,nomsuNumber,nomsuParenGroup,nomsuText,nomsuList,nomsuDict,nomsuTextWord
-hi nomsuIndex ctermfg=Yellow
+syn match nomsuVarParens /[()]/ contained
+hi nomsuVarParens ctermfg=LightCyan
 
 syn match nomsuWord /\([a-zA-Z_]\|[^\x00-\xff]\)\([a-zA-Z0-9_]\|[^\x00-\xff]\)*/
 hi def link nomsuWord Function
 hi nomsuWord ctermfg=White
-syn match nomsuOpWord ;\v[`~!@^&*_+=|<>?'/-]+;
+syn match nomsuOpWord ;[`~!@^&*_+=<>?'/-]\+\|\(^\s*\)\@<!#;
 hi def link nomsuOpWord Function
 hi nomsuOpWord ctermfg=LightYellow
 
-syn match nomsuNumber /-\?\(0x\x\+\|\d\+\(\.\(\d\+\)\?\)\?\|\.\d\+\)/ nextgroup=nomsuIndex
+syn match nomsuNumber /-\?\(0x\x\+\|\d\+\(\.\(\d\+\)\?\)\?\|\.\d\+\)/
 hi def link nomsuNumber Number
 hi nomsuNumber ctermfg=Red
 
+syn match nomsuInt /-\?\(0x\x\+\|\d\+\)/
+hi def link nomsuInt Number
+hi nomsuInt ctermfg=Red
+
+syn match nomsuTextWord /\([a-zA-Z_]\|[^\x00-\xff]\)\([a-zA-Z0-9_]\|[^\x00-\xff]\)*/ contained
+hi def link nomsuTextWord String
+
+syn match nomsuIndex /\./ nextgroup=nomsuTextWord,@nomsuExpr
+hi nomsuIndex ctermfg=Yellow
+
 syn match nomsuDotDot /\.\./
 hi def link nomsuDotDot Special
 hi nomsuDotDot ctermfg=DarkGray
@@ -97,12 +102,12 @@ syn match nomsuSemicolon /;/
 hi nomsuSemicolon ctermfg=Blue
 hi def link nomsuSemicolon Delimiter
 
-syn cluster nomsuAll contains=nomsuParenGroup,nomsuText,nomsuLongText,nomsuComment,nomsuOneLineComment,
-\                             nomsuVar,nomsuNumber,nomsuDict,nomsuList,nomsuColon,nomsuSemicolon,
-\                             nomsuDotDot,nomsuWord,nomsuOpWord
+syn cluster nomsuExpr contains=nomsuParenGroup,nomsuText,nomsuLongText,nomsuVar,nomsuNumber,
+\             nomsuDict,nomsuList,nomsuIndentedBlock
 
-syn match nomsuDictWordKey /\([a-zA-Z_]\|[^\x00-\xff]\)\([a-zA-Z0-9_]\|[^\x00-\xff]\)*\(:\)\@=/ contained
-hi def link nomsuDictWordKey String
+syn cluster nomsuAll contains=nomsuParenGroup,nomsuText,nomsuLongText,nomsuComment,
+\             nomsuVar,nomsuNumber,nomsuDict,nomsuList,nomsuIndentedBlock,nomsuColon,nomsuSemicolon,
+\             nomsuDotDot,nomsuWord,nomsuOpWord,nomsuComma,nomsuIndex
 
 if !exists('b:current_syntax')
   let b:current_syntax = 'nomsu'