Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

math update

  • Loading branch information...
commit b0c9fee40f405d1dc1148b18a8f022c95c51e143 1 parent 300c8f6
@brosensteiner authored
View
2  SyntaxInjections/Tcl_Injections.xml
@@ -39,7 +39,7 @@ THE SOFTWARE.
<collection name="ZoneHelper">
<zone name="tcl.s">
<starts-with>
- <expression>(?&lt;!\{|"|\[)\s</expression>
+ <expression>(?&lt;!\{|"|\[)[[:space:]]</expression>
</starts-with>
<ends-with>
<expression>(?=\S)</expression>
View
49 Syntaxes/TclSyntax.xml
@@ -471,6 +471,23 @@ THE SOFTWARE.
<include syntax="language-root.tcl" />
</subzones>
</zone>
+ <!--that expr don´t get mixed up with math functions and parenthesis can be highlighted:-->
+ <zone name="tcl.container.function-call-expr">
+ <starts-with>
+ <expression>\b(expr)\s+(\()</expression>
+ <capture number="1" name="tcl.keyword.command.function-call"/>
+ <capture number="2" name="tcl.punctuation.open-parenthesis"/>
+ </starts-with>
+ <ends-with>
+ <expression>\)</expression>
+ <capture number="0" name="tcl.punctuation.close-parenthesis"/>
+ </ends-with>
+ <subzones>
+ <include collection="Operators" />
+ <include collection="Parenthesis" />
+ <include syntax="language-root.tcl" />
+ </subzones>
+ </zone>
<!--here comes zones which can maybe produce nameclashes (especially with amira syntax) with other keywords so they are more specific-->
<zone>
@@ -618,30 +635,13 @@ THE SOFTWARE.
</collection>
<collection name="Math">
- <!--that expr don´t get mixed up with math functions and parenthesis can be highlighted:-->
- <zone name="tcl.container.function-call-expr">
- <starts-with>
- <expression>\b(expr)\s+(\()</expression>
- <capture number="1" name="tcl.keyword.command.function-call"/>
- <capture number="2" name="tcl.punctuation.open-parenthesis"/>
- </starts-with>
- <ends-with>
- <expression>\)</expression>
- <capture number="0" name="tcl.punctuation.close-parenthesis"/>
- </ends-with>
- <subzones>
- <include collection="Operators" />
- <include collection="Parenthesis" />
- <include syntax="language-root.tcl" />
- </subzones>
- </zone>
+
<!--tcl has some parenthesis syntactical sugar for math (since tcl 8.5 one can define individual math functions, but this can not be handled with epresso zone syntax, because it would conflict with EIAS in tcl)-->
<zone name="tcl.container.math">
<starts-with>
- <expression>(?&lt;=\s|^)(\+|-|\*|\/|%|&gt;|&lt;|\||\^|&amp;|=)?(abs|acos|asin|atan|atan2|bool|ceil|cos|cosh|double|entier|exp|floor|fmod|hypot|int|isqrt|log|log10|max|min|pow|rand|round|sin|sinh|sqrt|srand|tan|tanh|wide)\s*(\()</expression>
- <capture number="1" name="tcl.keyword.tcl-operator.arithmetic"/>
- <capture number="2" name="tcl.keyword.operator.math"/>
- <capture number="3" name="tcl.keyword.punctuation.open-parenthesis"/>
+ <expression>\b(abs|acos|asin|atan|atan2|bool|ceil|cos|cosh|double|entier|exp|floor|fmod|hypot|int|isqrt|log|log10|max|min|pow|rand|round|sin|sinh|sqrt|srand|tan|tanh|wide)\s*(\()</expression>
+ <capture number="1" name="tcl.keyword.command.function-call.operator.tcl-operator"/>
+ <capture number="2" name="tcl.keyword.punctuation.open-parenthesis"/>
</starts-with>
<ends-with>
<expression>\)</expression>
@@ -651,15 +651,14 @@ THE SOFTWARE.
<include collection="Operators" />
<include syntax="language-root.tcl" />
<zone>
- <expression>(?&lt;!,),(?!,)</expression>
+ <expression>,</expression>
<capture number="0" name="tcl.keyword.punctuation.comma"/>
</zone>
</subzones>
</zone>
<zone>
- <expression>(?&lt;=\s|^)(\+|-|\*|\/|%|&gt;|&lt;|\||\^|&amp;|=)?(abs|acos|asin|atan|atan2|bool|ceil|cos|cosh|double|entier|exp|floor|fmod|hypot|int|isqrt|log|log10|max|min|pow|rand|round|sin|sinh|sqrt|srand|tan|tanh|wide)\b</expression>
- <capture number="1" name="tcl.keyword.tcl-operator.arithmetic"/>
- <capture number="2" name="tcl.keyword.operator.math"/>
+ <expression>\b(abs|acos|asin|atan|atan2|bool|ceil|cos|cosh|double|entier|exp|floor|fmod|hypot|int|isqrt|log|log10|max|min|pow|rand|round|sin|sinh|sqrt|srand|tan|tanh|wide)\b</expression>
+ <capture number="1" name="tcl.keyword.command.function-call.operator.tcl-operator"/>
</zone>
</collection>
View
BIN  Tcl Sugar.esproj/user.brosensteiner.espressostorage
Binary file not shown
Please sign in to comment.
Something went wrong with that request. Please try again.