Prepare v10.5.0 release

Various fixes for the Kick Assembler grammar

CHANGELOG.md

@@ -1,3 +1,7 @@
+# v10.4.0
+
+* Fix operator regex for ACME grammar (again) [#17](https://github.com/MatthewCallis/language-65asm/pull/17)
+
 # v10.0.0
 
 * Add support for asm6 assembler

README.md

@@ -57,4 +57,5 @@ See last line in grammar files for names.
 - [ARM9](https://github.com/ARM9)
 - [georgjz](https://github.com/georgjz)
 - [GoDot](http://www.godot64.de/)
-- [NotArtyom](https://github.com/ProbablyNotArtyom)
+- [Carson Herrington](https://github.com/ProbablyNotArtyom)
+- [Michael Lass](https://github.com/michaellass)

grammars/acme.cson

@@ -124,8 +124,8 @@ repository:
       }
       # Operators
       {
-        match: '\!|\+|\-|\/|\|<<|>>|&|\||\^|=|<|>|\:'
+        match: '\\!|\\+|\\-|\\/|\\*|<<|>>|&|\\||\\^|=|<|>|\\:'
-        name:   'keyword.operator'
+        name:   'keyword.operator.acme'
       }
       # Operators II
       {

grammars/cc65-toolchain.cson

@@ -1,4 +1,4 @@
-# Syntax Highlighting for the cc65 toolchain ans 6502 support
+# Syntax Highlighting for the cc65 toolchain and 6502 support
 
 scopeName: 'source.assembly.6502.cc65-toolchain'
 name: '6502 Assembly (cc65)'      # Name shown in Atom Editor grammar selection

grammars/kickass.cson

@@ -36,8 +36,12 @@ repository:
 			# ===============================================================
 			# Assembler symbols
 			{	# Labels
+				match: '^\\s*[a-zA-Z_][a-zA-Z0-9_]*:'
+				name: 'entity.name.function.kickass'
+			}
+			{	# Local labels
+				match: '!(:|[\\+\\-]+)'
 				name: 'entity.name.function.kickass'
-				match: '^\\s*[!a-zA-Z_][a-zA-Z0-9_]*:'
 			}
 			{	# Variable functions, like var.getValue()
 				match: '(\\w+(?=\\())'
@@ -51,9 +55,9 @@ repository:
 				name: 'string.char.kickass'
 			}
 			{	# Strings
-				name: 'string.quoted.kickass'
 				begin: '"'
 				end: '"'
+				name: 'string.quoted.kickass'
 			}
 
 			{	# Hex numbers
@@ -62,27 +66,22 @@ repository:
 			}
 			{	# Octals
 				match: '@([0-7]+)\\b'
-				name: 'constant.numeric.octal.merlin'
+				name: 'constant.numeric.octal.kickass'
 			}
 			{	# Binary numbers
 				match: '%[01]+'
-				name: 'constant.numeric.binary.merlin'
+				name: 'constant.numeric.binary.kickass'
 			}
 			{	# Decimal numbers
 				match: '\\b([0-9]+)\\b'
-				name: 'constant.numeric.decimal.merlin'
+				name: 'constant.numeric.decimal.kickass'
-			}
-
-			{	# Operators
-				match: '[-+/*^><|#\\[\\](),=.!&]'
-				name: 'keyword.operator.kickass'
 			}
 			{	# Immediate values
-				match: '\\#(\'.\'|[^\\s\']+)'
+				match: '\\#([^\\s]+)'
 				name: 'constant.numeric.hex.kickass'
 			}
 			{	# Constants
-				match: '\\b([_A-Z]+)\\b'
+				match: '\\b([_A-Z][_A-Z0-9]+)\\b'
 				name: 'variable.kickass'
 			}
 		]
@@ -139,7 +138,7 @@ repository:
 			# ===============================================================
 			# Variables and Macros
 			{
-				match: '(\\.)(var|eval|const|label)(\\s*[a-zA-Z0-9_]*)(\\s*=)'
+				match: '(\\.)(var|eval|const|label)(\\s*[a-zA-Z0-9_]*)(\\s*=)?'
 				captures:
 					1: name: 'keyword.control.directive.kickass'
 					2: name: 'keyword.control.directive.kickass'
@@ -147,11 +146,10 @@ repository:
 					4: name: 'keyword.operator.kickass'
 			}
 			{
-				match: '(\\.)(var|eval|const|label)(\\s*[a-zA-Z0-9_]*)'
+				match: '(?:\\()(var|eval|const|label)(?=\\s*[a-zA-Z0-9_]*)'
 				captures:
 					1: name: 'keyword.control.directive.kickass'
-					2: name: 'keyword.control.directive.kickass'
+					2: name: 'support.function.kickass'
-					3: name: 'support.function.kickass'
 			}
 			{
 				match: '(\\.)(function|macro)([\\s\\w_.]*)(\\()([^)]*)(\\))'

package.json

@@ -1,6 +1,6 @@
 {
   "name": "language-65asm",
-  "version": "10.3.0",
+  "version": "10.5.0",
   "description": "Adds syntax highlighting to 65816/65C816/65802/6502/65C02 files in Atom, with extra support for various compilers.",
   "repository": "git@github.com:MatthewCallis/language-65asm.git",
   "license": "MIT",