lib/rouge/lexers/cpp.rb in rouge-0.5.1 vs lib/rouge/lexers/cpp.rb in rouge-0.5.2

@@ -1,8 +1,10 @@
+require Pathname.new(__FILE__).dirname.join('c.rb')
+
 module Rouge
   module Lexers
-    class Cpp < RegexLexer
+    class Cpp < C
       desc "The C++ programming language"
 
       tag 'cpp'
       aliases 'c++'
       # the many varied filenames of c++ source files...
@@ -11,148 +13,41 @@
                 '*.cc',  '*.hh',
                 '*.cxx', '*.hxx'
       mimetypes 'text/x-c++hdr', 'text/x-c++src'
 
       def self.keywords
-        @keywords ||= Set.new %w(
-          asm auto break case catch const const_cast continue
-          default delete do dynamic_cast else enum explicit export
-          extern for friend goto if mutable namespace new operator
-          private protected public register reinterpret_cast return
-          restrict sizeof static static_cast struct switch template
-          this throw throws try typedef typeid typename union using
-          volatile virtual while
-        )
+        @keywords ||= super + Set.new(%w(
+          asm catch const_cast delete dynamic_cast explicit export
+          friend mutable namespace new operator private protected public
+          reinterpret_cast restrict static_cast template this throw
+          throws typeid typename using virtual
+        ))
       end
 
-      def self.keywords_type
-        @keywords_type ||= Set.new %w(
-          bool int long float short double char unsigned signed void wchar_t
-        )
-      end
-
       def self.reserved
-        @reserved ||= Set.new %w(
-          __asm __int8 __based __except __int16 __stdcall __cdecl
-          __fastcall __int32 __declspec __finally __int64 __try
-          __leave __wchar_t __w64 __virtual_inheritance __uuidof
-          __unaligned __super __single_inheritance __raise __noop
-          __multiple_inheritance __m128i __m128d __m128 __m64 __interface
-          __identifier __forceinline __event __assume
-          inline _inline __inline
-          naked _naked __naked
-          thread _thread __thread
-        )
+        @reserved ||= super + Set.new(%w(
+          __virtual_inheritance __uuidof __super __single_inheritance
+          __multiple_inheritance __interface __event
+        ))
       end
 
-      # optional comments or whitespace
-      ws = %r((?:\s|//.*?\n|/[*].*?[*]/)+)
       id = /[a-zA-Z_][a-zA-Z0-9]*/
 
-      start { push :bol }
-
-      state :bol do
-        mixin :inline_whitespace
-        rule /#if\s+0/ do
-          token Comment::Preproc
-          goto :if_0
-        end
-
-        rule /#/ do
-          token Comment::Preproc
-          goto :macro
-        end
-
-        rule(//) { pop! }
-      end
-
-      state :inline_whitespace do
-        rule /[ \t\r]+/, Text
-        rule /\\\n/, Text
-        rule %r(/(\\\n)?[*].*?[*](\\\n)?/)m, Comment::Multiline
-      end
-
-      state :whitespace do
-        mixin :inline_whitespace
-        rule %r(/(\\\n)?/(\n|(.|\n)*?[^\\]\n)), Comment::Single, :bol
-        rule /\n/, Text, :bol
-      end
-
-      state :multiline_comment do
-        rule %r([*](\\\n)?/), Comment::Multiline, :pop!
-        rule %r([*]), Comment::Multiline
-        rule %r([^*]+), Comment::Multiline
-      end
-
-      state :root do
-        mixin :whitespace
-
-        rule /L?"/, Str, :string
-        rule %r(L?'(\\.|\\[0-7]{1,3}|\\x[a-f0-9]{1,2}|[^\\'\n])')i, Str::Char
-        rule %r((\d+\.\d*|\.\d+|\d+)[e][+-]?\d+[lu]*)i, Num::Float
-        rule /0x[0-9a-f]+[lu]*/i, Num::Hex
-        rule /0[0-7]+[lu]*/i, Num::Oct
-        rule /\d+[lu]*/i, Num::Integer
-        rule %r(\*/), Error
-        rule %r([~!%^&*+=\|?:<>/-]), Operator
-        rule /[()\[\],.;{}]/, Punctuation
-
-        rule /class\b/, Keyword, :classname
-
+      prepend :root do
         # Offload C++ extensions, http://offload.codeplay.com/
         rule /(?:__offload|__blockingoffload|__outer)\b/, Keyword::Pseudo
+      end
 
-        rule /(true|false)\b/, Keyword::Constant
-        rule /NULL\b/, Name::Builtin
-        rule /#{id}:(?!:)/, Name::Label
-        rule id do |m|
-          name = m[0]
-
-          if self.class.keywords.include? name
-            token Keyword
-          elsif self.class.keywords_type.include? name
-            token Keyword::Type
-          elsif self.class.reserved.include? name
-            token Keyword::Reserved
-          else
-            token Name
-          end
-        end
+      prepend :statements do
+        rule /class\b/, Keyword, :classname
       end
 
       state :classname do
         rule id, Name::Class, :pop!
 
         # template specification
         rule /\s*(?=>)/m, Text, :pop!
         mixin :whitespace
-      end
-
-      state :string do
-        rule /"/, Str, :pop!
-        rule /\\([\\abfnrtv"']|x[a-fA-F0-9]{2,4}|[0-7]{1,3})/, Str::Escape
-        rule /[^\\"\n]+/, Str
-        rule /\\\n/, Str
-        rule /\\/, Str # stray backslash
-      end
-
-      state :macro do
-        rule %r([^/\n]+), Comment::Preproc
-        rule %r(/[*].*?[*]/)m, Comment::Multiline
-        rule %r(//.*$), Comment::Single
-        rule %r(/), Comment::Preproc
-        rule /(?<=\\)\n/, Comment::Preproc
-        rule /\n/ do
-          token Comment::Preproc
-          goto :bol
-        end
-      end
-
-      state :if_0 do
-        rule /^\s*#if.*?(?<!\\)\n/, Comment::Preproc, :if_0
-        rule /^\s*#el(?:se|if).*\n/, Comment::Preproc, :pop!
-        rule /^\s*#endif.*?(?<!\\)\n/, Comment::Preproc, :pop!
-        rule /.*?\n/, Comment
       end
     end
   end
 end