JavaScriptCore-7601.1.46.3.tar.gz

[apple/javascriptcore.git] / offlineasm / parser.rb

diff --git a/offlineasm/parser.rb b/offlineasm/parser.rb
index 04f70a4bd0ac0a66cce1591d1c499f56191af61e..a122a68c4c3ad8e6ae20e8819d53ceb2120f45a8 100644 (file)
--- a/offlineasm/parser.rb
+++ b/offlineasm/parser.rb
@@ -165,6 +165,8 @@ def lex(str, fileName)
             result << Token.new(CodeOrigin.new(fileName, lineNumber), $&)
         when /\A[:,\(\)\[\]=\+\-~\|&^*]/
             result << Token.new(CodeOrigin.new(fileName, lineNumber), $&)
             result << Token.new(CodeOrigin.new(fileName, lineNumber), $&)
         when /\A[:,\(\)\[\]=\+\-~\|&^*]/
             result << Token.new(CodeOrigin.new(fileName, lineNumber), $&)

+        when /\A".*"/
+            result << Token.new(CodeOrigin.new(fileName, lineNumber), $&)

         else
             raise "Lexer error at #{CodeOrigin.new(fileName, lineNumber).to_s}, unexpected sequence #{str[0..20].inspect}"
         end
         else
             raise "Lexer error at #{CodeOrigin.new(fileName, lineNumber).to_s}, unexpected sequence #{str[0..20].inspect}"
         end


@@ -212,6 +214,10 @@ def isInteger(token)
     token =~ /\A[0-9]/
 end
 
     token =~ /\A[0-9]/
 end
 

+def isString(token)
+    token =~ /\A".*"/
+end
+

 #
 # The parser. Takes an array of tokens and returns an AST. Methods
 # other than parse(tokens) are not for public consumption.
 #
 # The parser. Takes an array of tokens and returns an AST. Methods
 # other than parse(tokens) are not for public consumption.


@@ -397,6 +403,10 @@ class Parser
             result = Immediate.new(@tokens[@idx].codeOrigin, @tokens[@idx].string.to_i)
             @idx += 1
             result
             result = Immediate.new(@tokens[@idx].codeOrigin, @tokens[@idx].string.to_i)
             @idx += 1
             result

+        elsif isString @tokens[@idx]
+            result = StringLiteral.new(@tokens[@idx].codeOrigin, @tokens[@idx].string)
+            @idx += 1
+            result

         elsif isIdentifier @tokens[@idx]
             codeOrigin, names = parseColonColon
             if names.size > 1
         elsif isIdentifier @tokens[@idx]
             codeOrigin, names = parseColonColon
             if names.size > 1


@@ -438,7 +448,7 @@ class Parser
     end
     
     def couldBeExpression
     end
     
     def couldBeExpression

-        @tokens[@idx] == "-" or @tokens[@idx] == "~" or @tokens[@idx] == "sizeof" or isInteger(@tokens[@idx]) or isVariable(@tokens[@idx]) or @tokens[@idx] == "("
+        @tokens[@idx] == "-" or @tokens[@idx] == "~" or @tokens[@idx] == "sizeof" or isInteger(@tokens[@idx]) or isString(@tokens[@idx]) or isVariable(@tokens[@idx]) or @tokens[@idx] == "("

     end
     
     def parseExpressionAdd
     end
     
     def parseExpressionAdd