Browse Source

Reviewed struct field name

Ray 4 years ago
parent
commit
565319184c
2 changed files with 10 additions and 10 deletions
  1. 2 2
      parser/README.md
  2. 8 8
      parser/raylib_parser.c

+ 2 - 2
parser/README.md

@@ -32,7 +32,7 @@ This parser is specifically designed to work with raylib.h, so, it has some cons
 ```
 ```
    <desc>
    <desc>
    typedef enum {
    typedef enum {
-       <valueName[0]> = <valueInt[0]>, <valueDesc[0]>
+       <valueName[0]> = <valueInteger[0]>, <valueDesc[0]>
        <valueName[1]>,
        <valueName[1]>,
        <valueName[2]>, <valueDesc[2]>
        <valueName[2]>, <valueDesc[2]>
        <valueName[3]>  <valueDesc[3]>
        <valueName[3]>  <valueDesc[3]>
@@ -41,7 +41,7 @@ This parser is specifically designed to work with raylib.h, so, it has some cons
    
    
 _NOTE: For enums, multiple options are supported:_
 _NOTE: For enums, multiple options are supported:_
       
       
- - If value is not provided, (<valueInt[i -1]> + 1) is assigned
+ - If value is not provided, (<valueInteger[i -1]> + 1) is assigned
  - Value description can be provided or not
  - Value description can be provided or not
 
 
 ## Additional notes
 ## Additional notes

+ 8 - 8
parser/raylib_parser.c

@@ -32,14 +32,14 @@
      
      
        <desc>
        <desc>
        typedef enum {
        typedef enum {
-           <valueName[0]> = <valueInt[0]>, <valueDesc[0]>
+           <valueName[0]> = <valueInteger[0]>, <valueDesc[0]>
            <valueName[1]>,
            <valueName[1]>,
            <valueName[2]>, <valueDesc[2]>
            <valueName[2]>, <valueDesc[2]>
            <valueName[3]>  <valueDesc[3]>
            <valueName[3]>  <valueDesc[3]>
        } <name>;
        } <name>;
        
        
        NOTE: Multiple options are supported: 
        NOTE: Multiple options are supported: 
-          - If value is not provided, (<valueInt[i -1]> + 1) is assigned
+          - If value is not provided, (<valueInteger[i -1]> + 1) is assigned
           - Value description can be provided or not
           - Value description can be provided or not
           
           
     This parser could work with other C header files if mentioned constraints are followed.
     This parser could work with other C header files if mentioned constraints are followed.
@@ -95,7 +95,7 @@ typedef struct EnumInfo {
     char desc[64];              // Enum description
     char desc[64];              // Enum description
     int valueCount;             // Number of values in enumerator
     int valueCount;             // Number of values in enumerator
     char valueName[128][64];    // Value name definition (max: 128 values)
     char valueName[128][64];    // Value name definition (max: 128 values)
-    int valueInt[128];          // Value integer (max: 128 values)
+    int valueInteger[128];      // Value integer (max: 128 values)
     char valueDesc[128][64];    // Value description (max: 128 values)
     char valueDesc[128][64];    // Value description (max: 128 values)
 } EnumInfo;
 } EnumInfo;
 
 
@@ -362,14 +362,14 @@ int main()
                             c++; n++;
                             c++; n++;
                         }
                         }
                         
                         
-                        if (integer[1] == 'x') enums[i].valueInt[enums[i].valueCount] = (int)strtol(integer, NULL, 16);
-                        else enums[i].valueInt[enums[i].valueCount] = atoi(integer);
+                        if (integer[1] == 'x') enums[i].valueInteger[enums[i].valueCount] = (int)strtol(integer, NULL, 16);
+                        else enums[i].valueInteger[enums[i].valueCount] = atoi(integer);
                     }
                     }
-                    else enums[i].valueInt[enums[i].valueCount] = (enums[i].valueInt[enums[i].valueCount - 1] + 1);
+                    else enums[i].valueInteger[enums[i].valueCount] = (enums[i].valueInteger[enums[i].valueCount - 1] + 1);
                     
                     
                     // TODO: Parse value description if any
                     // TODO: Parse value description if any
                 }
                 }
-                else enums[i].valueInt[enums[i].valueCount] = (enums[i].valueInt[enums[i].valueCount - 1] + 1);
+                else enums[i].valueInteger[enums[i].valueCount] = (enums[i].valueInteger[enums[i].valueCount - 1] + 1);
 
 
                 enums[i].valueCount++;
                 enums[i].valueCount++;
             }
             }
@@ -480,7 +480,7 @@ int main()
     {
     {
         printf("Enum %02i: %s (%i values)\n", i + 1, enums[i].name, enums[i].valueCount);
         printf("Enum %02i: %s (%i values)\n", i + 1, enums[i].name, enums[i].valueCount);
         //printf("Description: %s\n", enums[i].desc);
         //printf("Description: %s\n", enums[i].desc);
-        for (int e = 0; e < enums[i].valueCount; e++) printf("  Value %s: %i\n", enums[i].valueName[e], enums[i].valueInt[e]);
+        for (int e = 0; e < enums[i].valueCount; e++) printf("  Value %s: %i\n", enums[i].valueName[e], enums[i].valueInteger[e]);
     }
     }
     
     
     // Print function info 
     // Print function info