Reviewed by
authorkmccullo <kmccullo@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 24 Oct 2006 03:55:22 +0000 (03:55 +0000)
committerkmccullo <kmccullo@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 24 Oct 2006 03:55:22 +0000 (03:55 +0000)
       - Build fix

        * JavaScriptCore.xcodeproj/project.pbxproj:
        * kjs/grammar.y:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@17240 268f45cc-cd09-0410-ab3c-d52691b4dbfc

JavaScriptCore/ChangeLog
JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
JavaScriptCore/kjs/grammar.y

index 2bc575d6360f1bc4f7c34b564412f39062b1b5f5..6101b2d393129fa0d0f310e11c6029c8837646c6 100644 (file)
@@ -1,3 +1,12 @@
+2006-10-23  Kevin McCullough  <KMcCullough@apple.com>
+
+        Reviewed by 
+
+       - Build fix
+
+        * JavaScriptCore.xcodeproj/project.pbxproj:
+        * kjs/grammar.y:
+
 2006-10-23  Kevin McCullough  <KMcCullough@apple.com>
 
         Reviewed by Maciej.
index f420f6583606fb804cc4f7f4d80e1eb42f108f97..8775d8a93af8ce76cee04d65fe649fa301dfac96 100644 (file)
                9322A00306C341D3009067BB /* libicucore.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libicucore.dylib; path = /usr/lib/libicucore.dylib; sourceTree = "<absolute>"; };
                932F5BD80822A1C700736975 /* Info.plist */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = text.xml; path = Info.plist; sourceTree = "<group>"; tabWidth = 8; };
                932F5BD90822A1C700736975 /* JavaScriptCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = JavaScriptCore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-               932F5BE10822A1C700736975 /* testkjs */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = testkjs; sourceTree = BUILT_PRODUCTS_DIR; };
+               932F5BE10822A1C700736975 /* testkjs */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = "compiled.mach-o.executable"; path = testkjs; sourceTree = BUILT_PRODUCTS_DIR; };
                933A3499038AE7C6008635CE /* grammar.y */ = {isa = PBXFileReference; explicitFileType = sourcecode.yacc; fileEncoding = 4; indentWidth = 4; path = grammar.y; sourceTree = "<group>"; tabWidth = 8; };
                933A349A038AE7C6008635CE /* identifier.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = identifier.h; sourceTree = "<group>"; tabWidth = 8; };
                933A349D038AE80F008635CE /* identifier.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = identifier.cpp; sourceTree = "<group>"; tabWidth = 8; };
index d00d42aa2741717bfcf3b2401ffac9cbd8cb36b7..1c92f683cb5a3ac9d35857fe7693dbca4262271b 100644 (file)
@@ -239,7 +239,7 @@ PrimaryExprNoBrace:
   | Literal
   | ArrayLiteral
   | IDENT                               { $$ = new ResolveNode(*$1); }
-  | '(' Expr ')'                        { $$ = $2->isResolveNode() || $$ = $2->isGroupNode() ?
+  | '(' Expr ')'                        { $$ = ($2->isResolveNode() || $2->isGroupNode()) ?
                                             $2 : new GroupNode($2); }
 ;