Skip to content

Commit

Permalink
changing 'within' keyword to 'in', hopefully without breaking anythin…
Browse files Browse the repository at this point in the history
…g :)
  • Loading branch information
objeck committed Feb 17, 2024
1 parent 567392d commit 67e2acb
Show file tree
Hide file tree
Showing 11 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion docs/syntax/geany/filetypes.Objeck.conf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

[keywords]
# all items must be in one line
primary=class method function public abstract private static native virtual Parent As from implements interface enum alias consts bundle use leaving if else do while within select break continue other for each reverse label return critical New and or xor true false
primary=class method function public abstract private static native virtual Parent As from implements interface enum alias consts bundle use leaving if else do while in select break continue other for each reverse label return critical New and or xor true false
secondary=Nil Byte ByteRef Int IntRef Float FloatRef Char CharRef Bool BoolRef String BaseArrayRef BoolArrayRef ByteArrayRef CharArrayRef FloatArrayRef IntArrayRef StringArrayRef Func2Ref Func3Ref Func4Ref FuncRef

[lexer_properties=C]
Expand Down
2 changes: 1 addition & 1 deletion docs/syntax/jedit/objeck.xml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
<KEYWORD1>if</KEYWORD1>
<KEYWORD1>else</KEYWORD1>
<KEYWORD1>do</KEYWORD1>
<KEYWORD1>within</KEYWORD1>
<KEYWORD1>in</KEYWORD1>
<KEYWORD1>while</KEYWORD1>
<KEYWORD1>select</KEYWORD1>
<KEYWORD1>break</KEYWORD1>
Expand Down
2 changes: 1 addition & 1 deletion docs/syntax/kate/objeck.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<item>if</item>
<item>else</item>
<item>do</item>
<item>within</item>
<item>in</item>
<item>while</item>
<item>static</item>
<item>select</item>
Expand Down
2 changes: 1 addition & 1 deletion docs/syntax/lite-xl/language_objeck.lua
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ syntax.add {
["else"] = "keyword",
["do"] = "keyword",
["while"] = "keyword",
["within"] = "keyword",
["in"] = "keyword",
["select"] = "keyword",
["break"] = "keyword",
["continue"] = "keyword",
Expand Down
2 changes: 1 addition & 1 deletion docs/syntax/notepadxx/objeck.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<Keywords name="Folders in comment, open">#~</Keywords>
<Keywords name="Folders in comment, middle"></Keywords>
<Keywords name="Folders in comment, close">~#</Keywords>
<Keywords name="Keywords1">and or within xor virtual if else do while break continue use bundle native static public private class interface function method select other otherwise enum for each reverse label return leaving lambdas consts</Keywords>
<Keywords name="Keywords1">and or in xor virtual if else do while break continue use bundle native static public private class interface function method select other otherwise enum for each reverse label return leaving lambdas consts</Keywords>
<Keywords name="Keywords2">Byte Int Parent implements from Float Char Bool Nil String true false</Keywords>
<Keywords name="Keywords3"></Keywords>
<Keywords name="Keywords4"></Keywords>
Expand Down
2 changes: 1 addition & 1 deletion docs/syntax/objeck-syntax.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
'QUOTEMARKS' => array('"'),
'ESCAPE_CHAR' => '\\',
'KEYWORDS' => array(1 => array('virtual', 'within', 'leaving', 'lambdas', 'if', 'else', 'do', 'while', 'use', 'bundle', 'native', 'break', 'continue', 'static', 'public', 'private', 'class', 'function', 'method', 'select', 'other', 'otherwise', 'consts', 'enum', 'for', 'each', 'reverse', 'label', 'return', 'from'), 2 => array('Byte', 'Int', 'Nil', 'Float', 'Char', 'Bool', 'String'), 3 => array('true', 'false')
'KEYWORDS' => array(1 => array('virtual', 'in', 'leaving', 'lambdas', 'if', 'else', 'do', 'while', 'use', 'bundle', 'native', 'break', 'continue', 'static', 'public', 'private', 'class', 'function', 'method', 'select', 'other', 'otherwise', 'consts', 'enum', 'for', 'each', 'reverse', 'label', 'return', 'from'), 2 => array('Byte', 'Int', 'Nil', 'Float', 'Char', 'Bool', 'String'), 3 => array('true', 'false')
),
'SYMBOLS' => array(
1 => array(
Expand Down
2 changes: 1 addition & 1 deletion docs/syntax/objeck.lang
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
<keyword>if</keyword>
<keyword>else</keyword>
<keyword>do</keyword>
<keyword>within</keyword>
<keyword>in</keyword>
<keyword>while</keyword>
<keyword>break</keyword>
<keyword>continue</keyword>
Expand Down
2 changes: 1 addition & 1 deletion docs/syntax/sublime/objeck.sublime-syntax
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ contexts:
push: double_quoted_string

# Keywords
- match: '\b(if|within|else|do|while|static|select|break|continue|other|otherwise|for|each|reverse|label|return|critical)\b'
- match: '\b(if|in|else|do|while|static|select|break|continue|other|otherwise|for|each|reverse|label|return|critical)\b'
scope: keyword.control.objeck-obs

- match: '\b(use|leaving|virtual|Parent|As|from|implements)\b'
Expand Down
2 changes: 1 addition & 1 deletion docs/syntax/textadept/objeck.lua
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ lex:add_rule('whitespace', token(lexer.WHITESPACE, lexer.space^1))
lex:add_rule('keyword', token(lexer.KEYWORD, word_match{
'class', 'method', 'function', 'public', 'abstract', 'private', 'static', 'native', 'virtual',
'Parent', 'As', 'from', 'implements', 'interface', 'enum', 'alias', 'consts', 'bundle',
'use', 'within', 'leaving', 'if', 'else', 'do', 'while', 'select', 'break', 'continue', 'other',
'use', 'in', 'leaving', 'if', 'else', 'do', 'while', 'select', 'break', 'continue', 'other',
'for', 'each', 'reverse', 'label', 'return', 'critical', 'New', 'and', 'or', 'xor',
'true', 'false'--, 'Nil'
}))
Expand Down
2 changes: 1 addition & 1 deletion docs/syntax/vscode/syntaxes/objeck.tmLanguage.json
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
"keywords": {
"patterns": [
{
"match": "\\b(use|leaving|if|else|do|while|select|break|continue|within|other|otherwise|for|each|reverse|label|return|critical)\\b",
"match": "\\b(use|leaving|if|else|do|while|select|break|continue|in|other|otherwise|for|each|reverse|label|return|critical)\\b",
"name": "keyword.control.objeck"
},
{
Expand Down
2 changes: 1 addition & 1 deletion programs/tests/prgm283.obs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
class Test {
function : Main(args : String[]) ~ Nil {
each(arg within args) {
each(arg in args) {
arg->PrintLine()
}
}
Expand Down

0 comments on commit 67e2acb

Please sign in to comment.