Fix QuakeWorld compilation by treating assignment to constants as a warning when...

diff --git a/doc/gmqcc.1 b/doc/gmqcc.1
index f3f6517550a043a1a77164b9153fd49dbf692b26..185092e4c8c910a0bc13b4f01fdfa75cc32217b2 100644 (file)
--- a/doc/gmqcc.1
+++ b/doc/gmqcc.1
@@ -327,10 +327,15 @@ it can happen that incompatible types are passed to functions. This
 enables several warnings when static typechecking cannot guarantee
 consistent behavior.
 .It Fl W Ns Cm breakdef
 enables several warnings when static typechecking cannot guarantee
 consistent behavior.
 .It Fl W Ns Cm breakdef

-When compiling original id1 QC, there is a definition for `break`
+When compiling original id1 QC there is a definition for `break`

 which conflicts with the 'break' keyword in GMQCC. Enabling this
 which conflicts with the 'break' keyword in GMQCC. Enabling this

-warning will print a warning when the definition occurs. The
-definition is ignored for both cases.
+will print a warning when the definition occurs. The definition is
+ignored for both cases.
+.It Fl W Ns Cm const-overwrite
+When compiling original QuakeWorld QC there are instances where
+code overwrites constants. This is considered an error, however
+for QuakeWorld to compile it needs to be treated as a warning
+instead, as such this warning only works when -std=qcc.

 .El
 .Sh COMPILE FLAGS
 .Bl -tag -width Ds
 .El
 .Sh COMPILE FLAGS
 .Bl -tag -width Ds

diff --git a/gmqcc.ini.example b/gmqcc.ini.example
index 9dbb6fbbc91d2a74ab4edf9c1b484e6646fb2064..7fc19fd07bff8fcf859087875a0639bfef2b69a4 100644 (file)
--- a/gmqcc.ini.example
+++ b/gmqcc.ini.example
@@ -31,7 +31,7 @@
     #write a ticket.
 
     FTEPP = true
     #write a ticket.
 
     FTEPP = true

-    
+

 
     #Enable some predefined macros. This only works in combination
     #with '-fftepp' and is currently not included by '-std=fteqcc'.
 
     #Enable some predefined macros. This only works in combination
     #with '-fftepp' and is currently not included by '-std=fteqcc'.


@@ -516,13 +516,21 @@
     UNSAFE_TYPES = true
 
 
     UNSAFE_TYPES = true
 
 

-    #When compiling original id1 QC, there is a definition for `break`
+    #When compiling original id1 QC there is a definition for `break`

     #which conflicts with the 'break' keyword in GMQCC. Enabling this
     #which conflicts with the 'break' keyword in GMQCC. Enabling this

-    #warning will print a warning when the definition occurs. The
-    #definition is ignored for both cases.
+    #print a warning when the definition occurs. The definition is
+    #ignored for both cases.

 
     BREAKDEF = true
 
 
     BREAKDEF = true
 

+
+    #When compiling original QuakeWorld QC there are instances where
+    #code overwrites constants. This is considered an error, however
+    #for QuakeWorld to compile it needs to be treated as a warning
+    #instead, as such this warning only works when -std=qcc.
+
+    CONST_OVERWRITE = true
+

 [optimizations]
     #Some general peephole optimizations. For instance the code `a = b
     #+ c` typically generates 2 instructions, an ADD and a STORE. This
 [optimizations]
     #Some general peephole optimizations. For instance the code `a = b
     #+ c` typically generates 2 instructions, an ADD and a STORE. This


@@ -563,7 +571,7 @@
 
     LOCAL_TEMPS = true
 
 
     LOCAL_TEMPS = true
 

- 
+

     #Causes temporary values which do not need to be backed up on a
     #CALL to not be stored in the function's locals-area. With this, a
     #CALL to a function may need to back up fewer values and thus exe‐
     #Causes temporary values which do not need to be backed up on a
     #CALL to not be stored in the function's locals-area. With this, a
     #CALL to a function may need to back up fewer values and thus exe‐

diff --git a/opts.c b/opts.c
index 3e7e2073b834539e1464b6dce0570d071be49a70..9aa8f633eff1c4ba2b901ae4d76b1d07fcee7a85 100644 (file)
--- a/opts.c
+++ b/opts.c
@@ -90,6 +90,7 @@ static void opts_setdefault(void) {
     opts_set(opts.warn,  WARN_UNINITIALIZED_CONSTANT,    true);
     opts_set(opts.warn,  WARN_DEPRECATED,                true);
     opts_set(opts.warn,  WARN_PARENTHESIS,               true);
     opts_set(opts.warn,  WARN_UNINITIALIZED_CONSTANT,    true);
     opts_set(opts.warn,  WARN_DEPRECATED,                true);
     opts_set(opts.warn,  WARN_PARENTHESIS,               true);

+    opts_set(opts.warn,  WARN_CONST_OVERWRITE,           true);

 
     /* flags */
     opts_set(opts.flags, ADJUST_VECTOR_FIELDS,           true);
 
     /* flags */
     opts_set(opts.flags, ADJUST_VECTOR_FIELDS,           true);

diff --git a/opts.def b/opts.def
index ee40cf5ff9a00f36fc7331ac1b09d144c4f0f452..f4d01e631ea2c163fb8fd6f5223009728ed9b1ba 100644 (file)
--- a/opts.def
+++ b/opts.def
@@ -94,6 +94,7 @@
     GMQCC_DEFINE_FLAG(PARENTHESIS)
     GMQCC_DEFINE_FLAG(UNSAFE_TYPES)
     GMQCC_DEFINE_FLAG(BREAKDEF)
     GMQCC_DEFINE_FLAG(PARENTHESIS)
     GMQCC_DEFINE_FLAG(UNSAFE_TYPES)
     GMQCC_DEFINE_FLAG(BREAKDEF)

+    GMQCC_DEFINE_FLAG(CONST_OVERWRITE)

 #endif
 
 #ifdef GMQCC_TYPE_OPTIMIZATIONS
 #endif
 
 #ifdef GMQCC_TYPE_OPTIMIZATIONS

diff --git a/parser.c b/parser.c
index e3b4d9abd12ba36b418a786d16089f9d477885ad..e0f46a4d2f092fcefddbacc874b764d531f39705 100644 (file)
--- a/parser.c
+++ b/parser.c
@@ -287,10 +287,18 @@ static bool check_write_to(lex_ctx_t ctx, ast_expression *expr)
     if (ast_istype(expr, ast_value)) {
         ast_value *val = (ast_value*)expr;
         if (val->cvq == CV_CONST) {
     if (ast_istype(expr, ast_value)) {
         ast_value *val = (ast_value*)expr;
         if (val->cvq == CV_CONST) {

-            if (val->name[0] == '#')
+            if (val->name[0] == '#') {

                 compile_error(ctx, "invalid assignment to a literal constant");
                 compile_error(ctx, "invalid assignment to a literal constant");

-            else
+                return false;
+            }
+            /*
+             * To work around quakeworld we must elide the error and make it
+             * a warning instead.
+             */
+            if (OPTS_OPTION_U32(OPTION_STANDARD) != COMPILER_QCC)

                 compile_error(ctx, "assignment to constant `%s`", val->name);
                 compile_error(ctx, "assignment to constant `%s`", val->name);

+            else
+                (void)!compile_warning(ctx, WARN_CONST_OVERWRITE, "assignment to constant `%s`", val->name);

             return false;
         }
     }
             return false;
         }
     }