Browse Source

Fixed compilation issue

Marco Bambini 6 years ago
parent
commit
0d8a6cc1aa

+ 1 - 0
.gitignore

@@ -318,3 +318,4 @@ gravity.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
 api/api.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
 *.xcscheme
 gravity.xcodeproj/xcuserdata/marco.xcuserdatad/xcschemes/xcschememanagement.plist
+*.xcscheme

+ 5 - 2
gravity.xcodeproj/project.pbxproj

@@ -261,7 +261,7 @@
 		A9506CE81E69AAEB009A0045 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0930;
+				LastUpgradeCheck = 1020;
 				ORGANIZATIONNAME = Creolabs;
 				TargetAttributes = {
 					A9506CEF1E69AAEB009A0045 = {
@@ -272,10 +272,11 @@
 			};
 			buildConfigurationList = A9506CEB1E69AAEB009A0045 /* Build configuration list for PBXProject "gravity" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = A9506CE71E69AAEB009A0045;
 			productRefGroup = A9506CF11E69AAEB009A0045 /* Products */;
@@ -325,6 +326,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -380,6 +382,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";

+ 2 - 2
gravity.xcodeproj/xcuserdata/marco.xcuserdatad/xcschemes/gravity.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -64,7 +64,7 @@
       </BuildableProductRunnable>
       <CommandLineArguments>
          <CommandLineArgument
-            argument = "/Users/marco/Desktop/POC_operator_string_sub"
+            argument = "/Users/marco/GitHub/Gravity/test/unittest/env/env.gravity"
             isEnabled = "YES">
          </CommandLineArgument>
       </CommandLineArguments>

+ 1 - 1
src/compiler/gravity_parser.c

@@ -2512,7 +2512,7 @@ static void parser_register_optional_classes (gravity_parser_t *parser) {
     #endif
     
     #ifdef GRAVITY_INCLUDE_ENV
-    gnode_t *decl2 = gnode_variable_create(NO_TOKEN, string_dup(GRAVITY_ENV_NAME()), NULL, 0, NULL, LAST_DECLARATION());
+    gnode_t *decl2 = gnode_variable_create(NO_TOKEN, string_dup(GRAVITY_ENV_NAME()), NULL, NULL, LAST_DECLARATION(), NULL);
     gnode_array_push(decls, decl2);
     #endif