reorganise things a bit to align further with the actual names/structure

1 files changed, 19 insertions, 19 deletions

diff --git a/compiler_and_linker/unsorted/CInline.c b/compiler_and_linker/unsorted/CInline.c
index 4cd3c4b..1afbde8 100644
--- a/compiler_and_linker/unsorted/CInline.c
+++ b/compiler_and_linker/unsorted/CInline.c
@@ -1709,7 +1709,7 @@ static Boolean CInline_InlineFunctionCheck(ENode *expr) {
         (object->datatype == DFUNC || (object->datatype == DVFUNC && (expr->flags & ENODE_FLAG_80)))
         )
     {
-        if (copts.always_inline)
+        if (copts.alwaysinline)
             return 1;
 
         if (copts.inline_bottom_up) {
@@ -2809,7 +2809,7 @@ static void CInline_ExportCheck(ENode *expr) {
                 expr = expr->data.funccall.funcref;
                 if (
                     copts.warn_notinlined &&
-                    !copts.dont_inline &&
+                    !copts.dontinline &&
                     ENODE_IS(expr, EOBJREF) &&
                     (expr->data.objref->qual & Q_INLINE) &&
                     expr->data.objref->datatype != DINLINEFUNC &&
@@ -2853,10 +2853,10 @@ static void CInline_ExportCheck(ENode *expr) {
 static void CInline_Expand(Statement *stmt) {
     Statement *scan;
 
-    if (!copts.dont_inline && copts.inlinelevel >= 0) {
+    if (!copts.dontinline && copts.inlinelevel >= 0) {
         if (copts.inline_bottom_up) {
-            inline_max_size = copts.inline_max_size;
-            while (inline_max_size > 1 && EstimateExpandedSizeOfFunction(stmt) > copts.inline_max_total_size)
+            inline_max_size = copts.inlinemaxsize;
+            while (inline_max_size > 1 && EstimateExpandedSizeOfFunction(stmt) > copts.inlinemaxtotalsize)
                 inline_max_size >>= 1;
         }
 
@@ -2891,7 +2891,7 @@ static void CInline_Expand(Statement *stmt) {
             if (!copts.inline_bottom_up && !any_inline_expanded)
                 break;
 
-            if (!copts.always_inline || copts.inline_bottom_up) {
+            if (!copts.alwaysinline || copts.inline_bottom_up) {
                 if (copts.inlinelevel == 0) {
                     if (copts.inline_bottom_up) {
                         if ((cinline_level + 1) >= 8)
@@ -3150,7 +3150,7 @@ void CInline_PackIFunctionData(CI_FuncData *funcdata, Statement *stmt, Object *o
 
     funcdata->can_inline = CInline_CanInline(object, stmt->next);
 
-    if (copts.isGeneratingDebugInfo) {
+    if (copts.filesyminfo) {
         funcdata->fileoffset = cparser_fileoffset;
         funcdata->fileoffset.is_inline = 1;
         funcdata->symdecloffset = symdecloffset;
@@ -3415,28 +3415,28 @@ static void CInline_GenIFunctionCode(Object *object, CI_FuncData *func, UInt8 un
     CScopeSave saveScope;
     Statement firstStmt;
 
-    if (cparamblkptr->isPrecompiling != 1 && func) {
+    if (cparamblkptr->precompile != 1 && func) {
         ObjGen_SetupSym();
         CScope_SetFunctionScope(object, &saveScope);
         CFunc_FuncGenSetup(&firstStmt, object);
         CInline_UnpackIFunctionData(object, func, &firstStmt);
 
-        saveDebugInfo = copts.isGeneratingDebugInfo;
+        saveDebugInfo = copts.filesyminfo;
         if (copts.nosyminline || (!symdecloffset && !symdeclend))
-            copts.isGeneratingDebugInfo = 0;
+            copts.filesyminfo = 0;
 
         expanding_function = object;
         recursive_inline = 0;
         CInline_Expand(&firstStmt);
 
         if (!anyerrors) {
-            if (copts.isGeneratingDebugInfo)
+            if (copts.filesyminfo)
                 CPrep_SetSourceFile(&cparser_fileoffset);
             CodeGen_Generator(&firstStmt, object, unk, 0);
         }
 
         CScope_RestoreScope(&saveScope);
-        copts.isGeneratingDebugInfo = saveDebugInfo;
+        copts.filesyminfo = saveDebugInfo;
     }
 }
 
@@ -3902,8 +3902,8 @@ void CInline_GenFunc(Statement *stmt, Object *object, UInt8 unk) {
     flag30 = 0;
     if (!(object->qual & Q_INLINE)) {
         if (
-            copts.autoinline &&
-            !copts.dont_inline &&
+            copts.auto_inline &&
+            !copts.dontinline &&
             CInline_CanInline(object, stmt->next) &&
             CInline_IsSmallFunction(object, stmt->next)
             )
@@ -3962,7 +3962,7 @@ void CInline_GenFunc(Statement *stmt, Object *object, UInt8 unk) {
     recursive_inline = 0;
     CInline_Expand(stmt);
 
-    if (copts.isGeneratingDebugInfo)
+    if (copts.filesyminfo)
         CPrep_SetSourceFile(&cparser_fileoffset);
 
     if (!anyerrors)
@@ -4175,8 +4175,8 @@ void CInline_Finish(void) {
     } while (doMore);
 
     nspace = CFunc_FuncGenSetup(&firstStmt, NULL);
-    saveDebugInfo = copts.isGeneratingDebugInfo;
-    copts.isGeneratingDebugInfo = 0;
+    saveDebugInfo = copts.filesyminfo;
+    copts.filesyminfo = 0;
 
     init = init_expressions;
     while (init) {
@@ -4196,11 +4196,11 @@ void CInline_Finish(void) {
     CInline_Expand(&firstStmt);
 
     if (!anyerrors) {
-        if (copts.isGeneratingDebugInfo)
+        if (copts.filesyminfo)
             CPrep_SetSourceFile(&cparser_fileoffset);
         CodeGen_Generator(&firstStmt, NULL, 0, 1);
     }
 
     cscope_current = nspace->parent;
-    copts.isGeneratingDebugInfo = saveDebugInfo;
+    copts.filesyminfo = saveDebugInfo;
 }