ALL macros (#403)

Author: ianfhunter

builtins/Alt_D6.dice.excluded builtins/WIP/d666.dice.excluded

@@ -1,2 +1 @@
-#DSIXSIX=(d6*10)+d6;@DSIXTYSIX
-#DSIXSIXSIX=(d6*100)+(d6*10)+d6
+#DSIXSIXSIX=(d6*100)+(d6*10)+d6

doc/gh-pages/notation/custom_macros.md

@@ -43,3 +43,5 @@ You can use ranges
 You can also use words
 
 `$FRIENDS={JOHN,MARY,TAI}`
+
+**Note:** Currently, if you wish to roll stored dice multiple times, you must do this in seperate statements e.g. `@FRIENDS;@FRIENDS;@FRIENDS`

src/grammar/dice.yacc

@@ -1679,6 +1679,16 @@ void load_builtins(char* root){
                 printf("/\n");
             }
         }else{
+            char *ext = strrchr(file.name, '.');
+
+            if(strcmp(".dice", ext) != 0){
+                if(verbose){
+                    printf("Skip %s\n", file.name);
+                }        
+                tinydir_next(&dir);
+                continue;
+            }
+
             count++;
             if(verbose){
                printf("\n");
@@ -1697,18 +1707,16 @@ void load_builtins(char* root){
 
             // TODO: Check filename for length
             FILE* fp = fopen(path, "r");
-            while (fgets(stored_str, max_macro_length, fp)!=NULL);
-
-            if(verbose){
-              printf("Contents: %s\n",stored_str); 
+            while (fgets(stored_str, max_macro_length, fp)!=NULL){
+                if(verbose){
+                    printf("Contents: %s\n",stored_str); 
+                }
+                YY_BUFFER_STATE buffer = yy_scan_string(stored_str);
+                yyparse();
+                yy_delete_buffer(buffer);
+                if(gnoll_errno){return;}
             }
             fclose(fp);
-            
-            YY_BUFFER_STATE buffer = yy_scan_string(stored_str);
-            yyparse();
-            yy_delete_buffer(buffer);
-            if(gnoll_errno){return;}
-
             free(path);
             free(stored_str);
         }
@@ -1754,7 +1762,7 @@ int main(int argc, char **str){
         0,  // Verbose
         0,  // Introspect
         0,  // Mocking
-        0,  // Builtins
+        1,  // Builtins
         0,  // Mocking
         0   // Mocking Seed
     );

src/grammar/operations/macros.c

@@ -112,7 +112,6 @@ void search_macros(char *skey, roll_params *to_store) {
 
   HASH_FIND_INT(macros, &k, s); /* s: output pointer */
 
-
   if (s == NULL) {
     if (verbose) printf("Macro:: UNDEFINED (macros.c)\n");
     gnoll_errno = UNDEFINED_MACRO;

src/grammar/util/safe_functions.c

@@ -22,10 +22,11 @@ void print_gnoll_errors(){
    * @brief A human-readable translation of the gnoll error codes
    * 
    */
-  if(verbose){
     switch(gnoll_errno){
       case SUCCESS:{
-        printf("%sErrorCheck: No Errors.%s\n",ANSI_COLOR_GREEN, ANSI_COLOR_RESET);
+        if(verbose){
+          printf("%sErrorCheck: No Errors.%s\n",ANSI_COLOR_GREEN, ANSI_COLOR_RESET);
+        }
         break;
       }
       case BAD_ALLOC:{
@@ -80,7 +81,6 @@ void print_gnoll_errors(){
         printf("%sErrorCheck: Error (Undetermined. Code %i).%s\n",ANSI_COLOR_RED, gnoll_errno, ANSI_COLOR_RESET);
         break;
       }
-    }
   }
 }