Commits

preevs committed aa3a6b7

fixed bad merge

Comments (0)

Files changed (1)

pygments/lexers/compiled.py

            'ScalaLexer', 'DylanLexer', 'OcamlLexer', 'ObjectiveCLexer',
            'FortranLexer', 'GLShaderLexer', 'PrologLexer', 'CythonLexer',
            'ValaLexer', 'OocLexer', 'GoLexer', 'FelixLexer', 'AdaLexer',
-<<<<<<< local
-           'Modula2Lexer', 'BlitzMaxLexer', 'GosuLexer', 'GosuTemplateLexer']
-=======
-           'Modula2Lexer', 'BlitzMaxLexer', 'NimrodLexer']
->>>>>>> other
+           'Modula2Lexer', 'BlitzMaxLexer', 'NimrodLexer', 'GosuLexer',
+           'GosuTemplateLexer']
 
 
 class CLexer(RegexLexer):
 
 class NimrodLexer(RegexLexer):
     """
-    For `Nimrod `_ source code.
+    For `Nimrod <http://nimrod-code.org/>`_ source code.
 
     *New in Pygments 1.5.*
     """
           (r".", String.Char)
         ],
         'strings': [
-            (r'(?            (r'[^\\\'"\$\n]+', String),
+            (r'(?<!\$)\$(\d+|#|\w+)+', String.Interpol),
+            (r'[^\\\'"\$\n]+', String),
             # quotes, dollars and backslashes must be parsed one at a time
             (r'[\'"\\]', String),
             # unhandled string formatting sign
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.