Unreviewed revert Fujii's revert in r237214 with new WinCairo build fix.
[WebKit-https.git] / Source / JavaScriptCore / offlineasm / settings.rb
index eec0925..ef57140 100644 (file)
@@ -90,7 +90,6 @@ end
 
 def forSettings(concreteSettings, ast)
     # Check which architectures this combinator claims to support.
-    numClaimedBackends = 0
     selectedBackend = nil
     BACKENDS.each {
         | backend |
@@ -166,7 +165,7 @@ end
 #
 
 def isASTErroneous(ast)
-    not ast.filter(Error).empty?
+    not ast.demacroify({}).filter(Error).empty?
 end
 
 #
@@ -204,7 +203,7 @@ def emitCodeInConfiguration(concreteSettings, ast, backend)
     end
     
     if isASTErroneous(ast)
-        $output.puts "#error \"Invalid configuration.\""
+        $output.puts "#error \"Invalid configuration. Error at: #{ast.filter(Error)[0].codeOrigin}\""
     elsif not WORKING_BACKENDS.include? backend
         $output.puts "#error \"This backend is not supported yet.\""
     else