pygments.rb 0.2.9 → 0.2.10

data/lib/pygments/version.rb

@@ -1,3 +1,3 @@
 module Pygments
-  VERSION = '0.2.9'
+  VERSION = '0.2.10'
 end

data/vendor/custom_lexers/github.py

@@ -29,8 +29,8 @@ class Dasm16Lexer(RegexLexer):
 
     INSTRUCTIONS = [
         'SET', 'ADD', 'SUB', 'MUL', 'DIV', 'MOD', 'SHL',
-        'SHR', 'AND', 'BOR', 'XOR', 'IFE', 'IFN', 'IFG'
-        'IFB', 'JSR'
+        'SHR', 'AND', 'BOR', 'XOR', 'IFE', 'IFN', 'IFG', 'IFB',
+        'JSR'
     ]
 
     REGISTERS = [
@@ -42,6 +42,7 @@ class Dasm16Lexer(RegexLexer):
     ]
 
     # Regexes yo
+    string = r'"(\\"|[^"])*"'
     char = r'[a-zA-Z$._0-9@]'
     identifier = r'(?:[a-zA-Z$_]' + char + '*|\.' + char + '+)'
     number = r'(?:0[xX][a-zA-Z0-9]+|\d+)'
@@ -49,7 +50,7 @@ class Dasm16Lexer(RegexLexer):
 
     def guess_identifier(lexer, match):
         ident = match.group(0)
-        klass = Name.Variable if ident in lexer.REGISTERS else Name.Label
+        klass = Name.Variable if ident.lower() in lexer.REGISTERS else Name.Label
         yield match.start(), klass, ident
 
     tokens = {
@@ -57,6 +58,7 @@ class Dasm16Lexer(RegexLexer):
             include('whitespace'),
             (':' + identifier, Name.Label),
             (instruction, Name.Function, 'instruction-args'),
+            (r'(DAT|dat)', Name.Function, 'data-args'),
             (r'[\r\n]+', Text)
         ],
 
@@ -72,15 +74,26 @@ class Dasm16Lexer(RegexLexer):
             include('whitespace')
         ],
 
+        'instruction-line' : [
+            (r'[\r\n]+', Text, '#pop'),
+            (r';.*?$', Comment, '#pop'),
+            include('whitespace')
+        ],
+
         'instruction-args': [
             (r',', Punctuation),
             (r'\[', Punctuation, 'deref'),
             include('arg'),
+            include('instruction-line')
+        ],
 
-            (r'[\r\n]+', Text, '#pop'),
-            (r';.*?$', Comment, '#pop'),
-            include('whitespace')
+        'data-args' : [
+            (r',', Punctuation),
+            (number, Number.Integer),
+            (string, String),
+            include('instruction-line')
         ],
+
         'whitespace': [
             (r'\n', Text),
             (r'\s+', Text),

data/vendor/pygments-main/pygments/lexers/github.py

@@ -29,8 +29,8 @@ class Dasm16Lexer(RegexLexer):
 
     INSTRUCTIONS = [
         'SET', 'ADD', 'SUB', 'MUL', 'DIV', 'MOD', 'SHL',
-        'SHR', 'AND', 'BOR', 'XOR', 'IFE', 'IFN', 'IFG'
-        'IFB', 'JSR'
+        'SHR', 'AND', 'BOR', 'XOR', 'IFE', 'IFN', 'IFG', 'IFB',
+        'JSR'
     ]
 
     REGISTERS = [
@@ -42,6 +42,7 @@ class Dasm16Lexer(RegexLexer):
     ]
 
     # Regexes yo
+    string = r'"(\\"|[^"])*"'
     char = r'[a-zA-Z$._0-9@]'
     identifier = r'(?:[a-zA-Z$_]' + char + '*|\.' + char + '+)'
     number = r'(?:0[xX][a-zA-Z0-9]+|\d+)'
@@ -49,7 +50,7 @@ class Dasm16Lexer(RegexLexer):
 
     def guess_identifier(lexer, match):
         ident = match.group(0)
-        klass = Name.Variable if ident in lexer.REGISTERS else Name.Label
+        klass = Name.Variable if ident.lower() in lexer.REGISTERS else Name.Label
         yield match.start(), klass, ident
 
     tokens = {
@@ -57,6 +58,7 @@ class Dasm16Lexer(RegexLexer):
             include('whitespace'),
             (':' + identifier, Name.Label),
             (instruction, Name.Function, 'instruction-args'),
+            (r'(DAT|dat)', Name.Function, 'data-args'),
             (r'[\r\n]+', Text)
         ],
 
@@ -72,15 +74,26 @@ class Dasm16Lexer(RegexLexer):
             include('whitespace')
         ],
 
+        'instruction-line' : [
+            (r'[\r\n]+', Text, '#pop'),
+            (r';.*?$', Comment, '#pop'),
+            include('whitespace')
+        ],
+
         'instruction-args': [
             (r',', Punctuation),
             (r'\[', Punctuation, 'deref'),
             include('arg'),
+            include('instruction-line')
+        ],
 
-            (r'[\r\n]+', Text, '#pop'),
-            (r';.*?$', Comment, '#pop'),
-            include('whitespace')
+        'data-args' : [
+            (r',', Punctuation),
+            (number, Number.Integer),
+            (string, String),
+            include('instruction-line')
         ],
+
         'whitespace': [
             (r'\n', Text),
             (r'\s+', Text),

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pygments.rb
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 2
-  - 9
-  version: 0.2.9
+  - 10
+  version: 0.2.10
 platform: ruby
 authors: 
 - Aman Gupta
@@ -15,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-09 00:00:00 Z
+date: 2012-04-09 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rubypython
@@ -412,6 +413,7 @@ files:
 - vendor/pygments-main/tests/test_token.py
 - vendor/pygments-main/tests/test_using_api.py
 - vendor/pygments-main/tests/test_util.py
+has_rdoc: true
 homepage: http://github.com/tmm1/pygments.rb
 licenses: []
 
@@ -441,7 +443,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: pygments wrapper for ruby