Merged in blackjack/pygments-main (pull request #88: CBM BASIC V2 and ca65 assembler)

1 files changed, 13 insertions, 5 deletions

diff --git a/pygments/lexers/asm.py b/pygments/lexers/asm.py
index aebe74f5..5f1d808a 100644
--- a/pygments/lexers/asm.py
+++ b/pygments/lexers/asm.py
@@ -5,7 +5,7 @@
 
     Lexers for assembly languages.
 
-    :copyright: Copyright 2006-2012 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2013 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -240,8 +240,8 @@ class LlvmLexer(RegexLexer):
              r'|linkonce_odr|weak|weak_odr|appending|dllimport|dllexport'
              r'|common|default|hidden|protected|extern_weak|external'
              r'|thread_local|zeroinitializer|undef|null|to|tail|target|triple'
-             r'|deplibs|datalayout|volatile|nuw|nsw|exact|inbounds|align'
-             r'|addrspace|section|alias|module|asm|sideeffect|gc|dbg'
+             r'|datalayout|volatile|nuw|nsw|nnan|ninf|nsz|arcp|fast|exact|inbounds'
+             r'|align|addrspace|section|alias|module|asm|sideeffect|gc|dbg'
 
              r'|ccc|fastcc|coldcc|x86_stdcallcc|x86_fastcallcc|arm_apcscc'
              r'|arm_aapcscc|arm_aapcs_vfpcc'
@@ -359,16 +359,19 @@ class NasmLexer(RegexLexer):
         ],
     }
 
+
 class Ca65Lexer(RegexLexer):
     """
     For ca65 assembler sources.
+
+    *New in Pygments 1.6.*
     """
     name = 'ca65'
     aliases = ['ca65']
     filenames = ['*.s']
-    
+
     flags = re.IGNORECASE
-    
+
     tokens = {
         'root': [
             (r';.*', Comment.Single),
@@ -388,3 +391,8 @@ class Ca65Lexer(RegexLexer):
             (r'[\w.@$][\w.@$\d]*', Name),
         ]
     }
+
+    def analyse_text(self, text):
+        # comments in GAS start with "#"
+        if re.match(r'^\s*;', text, re.MULTILINE):
+            return 0.9