Skip to content

Commit

Permalink
Merge pull request #14 from aditmehta9/master
Browse files Browse the repository at this point in the history
Added sync to 'control keyword'
[contributed by @aditmehta9, reviewed and validated by Lydia]

Also extends the type modifier structure, and alphabetizes some
of the keyword lists.
  • Loading branch information
lydia-duncan authored Jan 25, 2018
2 parents 07a229e + cf537b7 commit c79a23e
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions Syntaxes/Chapel.tmLanguage
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,19 @@
</dict>
<dict>
<key>match</key>
<string>\b(align|as|atomic|begin|break|by|catch|class|cobegin|coforall|continue|delete|dmapped|do|else|enum|except|export|extern|for|forall|if|index|inline|in|inout|iter|label|lambda|let|local|module|new|noinit|on|only|otherwise|out|pragma|private|proc|prototype|public|record|reduce|ref|require|return|scan|select|serial|then|throw|throws|try|union|use|var|when|where|while|with|yield|zip)\b</string>
<string>\b(align|as|atomic|begin|break|by|catch|class|cobegin|coforall|continue|delete|dmapped|do|else|enum|except|export|extern|for|forall|if|index|inline|in|inout|iter|label|lambda|let|local|module|new|noinit|on|only|otherwise|out|pragma|private|proc|prototype|public|record|reduce|ref|require|return|scan|select|serial|sync|then|throw|throws|try|union|use|var|when|where|while|with|yield|zip)\b</string>
<key>name</key>
<string>keyword.control.chapel</string>
</dict>
<dict>
<key>match</key>
<string>\b(bool|real|int|uint|imag|complex|dmap|domain|opaque|string|range|subdomain|sync|tuple)\b</string>
<string>\b(bool|complex|dmap|domain|imag|int|opaque|range|real|string|subdomain|tuple|uint)\b</string>
<key>name</key>
<string>storage.type.chapel</string>
</dict>
<dict>
<key>match</key>
<string>\b(config|const|param|private|public|sparse|single|type|enum)\b</string>
<string>\b(config|const|enum|param|private|public|single|sparse|sync|type)\b</string>
<key>name</key>
<string>storage.modifier.chapel</string>
</dict>
Expand All @@ -53,7 +53,7 @@
</dict>
<dict>
<key>match</key>
<string>\b(this|super|these|here|Locales|LocaleSpace|numLocales|locale|FileAccessMode)\b</string>
<string>\b(FileAccessMode|here|LocaleSpace|Locales|locale|numLocales|super|these|this)\b</string>
<key>name</key>
<string>variable.language.chapel</string>
</dict>
Expand Down Expand Up @@ -269,8 +269,7 @@
<dict>
<key>match</key>
<string>(?x)\b(
abs | max | min | sqrt | write | writeln | read | readln | open | close |
exit
abs | close | exit| max | min | open | read | readln | sqrt | write | writeln
)\b</string>
<key>name</key>
Expand Down Expand Up @@ -379,7 +378,7 @@
<key>illegal_names</key>
<dict>
<key>match</key>
<string>\b(align|as|atomic|begin|break|by|catch|class|cobegin|coforall|continue|delete|dmapped|do|else|enum|except|export|extern|for|forall|if|index|inline|in|inout|iter|label|lambda|let|local|module|new|noinit|on|only|otherwise|out|pragma|private|proc|public|record|reduce|ref|require|return|scan|select|serial|then|throw|throws|try|union|use|var|when|where|while|with|yield|zip)\b</string>
<string>\b(align|as|atomic|begin|break|by|catch|class|cobegin|coforall|continue|delete|dmapped|do|else|enum|except|export|extern|for|forall|if|index|inline|in|inout|iter|label|lambda|let|local|module|new|noinit|on|only|otherwise|out|pragma|private|proc|public|record|reduce|ref|require|return|scan|select|serial|single|sync|then|throw|throws|try|union|use|var|when|where|while|with|yield|zip)\b</string>
<key>name</key>
<string>invalid.illegal.name.chapel</string>
</dict>
Expand Down

0 comments on commit c79a23e

Please sign in to comment.