Completed refactoring

mpc.h

@@ -23,17 +23,17 @@
 struct mpc_err_t;
 typedef struct mpc_err_t mpc_err_t;
 
-int mpc_err_line(mpc_err_t* x);
-int mpc_err_column(mpc_err_t* x);
-char mpc_err_unexpected(mpc_err_t* x);
-char** mpc_err_expected(mpc_err_t* x, int* num);
-char* mpc_err_filename(mpc_err_t* x);
-char* mpc_err_failure(mpc_err_t* x);
-
 void mpc_err_delete(mpc_err_t* x);
 void mpc_err_print(mpc_err_t* x);
 void mpc_err_print_to(mpc_err_t* x, FILE* f);
-char* mpc_err_string_new(mpc_err_t* x);
+void mpc_err_string(mpc_err_t* x, char** out);
+
+int mpc_err_line(mpc_err_t* x);
+int mpc_err_column(mpc_err_t* x);
+char mpc_err_unexpected(mpc_err_t* x);
+void mpc_err_expected(mpc_err_t* x, char** out, int* out_num, int out_max);
+char* mpc_err_filename(mpc_err_t* x);
+char* mpc_err_failure(mpc_err_t* x);
 
 /*
 ** Parsing
@@ -58,23 +58,22 @@ int mpc_fparse_contents(const char* filename, mpc_parser_t* p, mpc_result_t* r);
 */
 
 typedef void(*mpc_dtor_t)(mpc_val_t*);
+typedef mpc_val_t*(*mpc_ctor_t)(void);
+
 typedef mpc_val_t*(*mpc_apply_t)(mpc_val_t*);
 typedef mpc_val_t*(*mpc_apply_to_t)(mpc_val_t*,void*);
 typedef mpc_val_t*(*mpc_fold_t)(int,mpc_val_t**);
-typedef mpc_val_t*(*mpc_lift_t)(void);
 
 /*
 ** Building a Parser
 */
 
-void mpc_delete(mpc_parser_t* p);
 mpc_parser_t* mpc_new(const char* name);
-
 mpc_parser_t* mpc_define(mpc_parser_t* p, mpc_parser_t* a);
 mpc_parser_t* mpc_undefine(mpc_parser_t* p);
 
+void mpc_delete(mpc_parser_t* p);
 void mpc_cleanup(int n, ...);
-void mpc_cleanup_va(int n, va_list va);
 
 /*
 ** Basic Parsers
@@ -83,7 +82,7 @@ void mpc_cleanup_va(int n, va_list va);
 mpc_parser_t* mpc_pass(void);
 mpc_parser_t* mpc_fail(const char* m);
 mpc_parser_t* mpc_failf(const char* fmt, ...);
-mpc_parser_t* mpc_lift(mpc_lift_t f);
+mpc_parser_t* mpc_lift(mpc_ctor_t f);
 mpc_parser_t* mpc_lift_val(mpc_val_t* x);
 
 mpc_parser_t* mpc_any(void);
@@ -95,23 +94,27 @@ mpc_parser_t* mpc_satisfy(int(*f)(char));
 mpc_parser_t* mpc_string(const char* s);
 
 /*
-** Core Parsers
+** Combinator Parsers
 */
 
-mpc_parser_t* mpc_expect(mpc_parser_t* a, const char* expected);
+mpc_parser_t* mpc_expect(mpc_parser_t* a, const char* e);
 mpc_parser_t* mpc_apply(mpc_parser_t* a, mpc_apply_t f);
 mpc_parser_t* mpc_apply_to(mpc_parser_t* a, mpc_apply_to_t f, void* x);
-mpc_parser_t* mpc_predictive(mpc_parser_t* a);
+
 mpc_parser_t* mpc_not(mpc_parser_t* a, mpc_dtor_t da);
-mpc_parser_t* mpc_not_lift(mpc_parser_t* a, mpc_dtor_t da, mpc_lift_t lf);
+mpc_parser_t* mpc_not_lift(mpc_parser_t* a, mpc_dtor_t da, mpc_ctor_t lf);
 mpc_parser_t* mpc_maybe(mpc_parser_t* a);
-mpc_parser_t* mpc_maybe_lift(mpc_parser_t* a, mpc_lift_t lf);
+mpc_parser_t* mpc_maybe_lift(mpc_parser_t* a, mpc_ctor_t lf);
+
 mpc_parser_t* mpc_many(mpc_fold_t f, mpc_parser_t* a);
 mpc_parser_t* mpc_many1(mpc_fold_t f, mpc_parser_t* a);
 mpc_parser_t* mpc_count(int n, mpc_fold_t f, mpc_parser_t* a, mpc_dtor_t da);
+
 mpc_parser_t* mpc_or(int n, ...);
 mpc_parser_t* mpc_and(int n, mpc_fold_t f, ...);
 
+mpc_parser_t* mpc_predictive(mpc_parser_t* a);
+
 /*
 ** Common Parsers
 */
@@ -180,19 +183,13 @@ mpc_parser_t* mpc_tok_brackets(mpc_parser_t* a, mpc_dtor_t ad);
 mpc_parser_t* mpc_tok_squares(mpc_parser_t* a, mpc_dtor_t ad);
 
 /*
-** Regular Expression Parsers
-*/
-
-mpc_parser_t* mpc_re(const char* re);
-
-/*
-** Common Fold Functions
+** Common Function Parameters
 */
 
 void mpcf_dtor_null(mpc_val_t* x);
 
-mpc_val_t* mpcf_lift_null(void);
-mpc_val_t* mpcf_lift_str(void);
+mpc_val_t* mpcf_ctor_null(void);
+mpc_val_t* mpcf_ctor_str(void);
 
 mpc_val_t* mpcf_free(mpc_val_t* x);
 mpc_val_t* mpcf_int(mpc_val_t* x);
@@ -204,8 +201,6 @@ mpc_val_t* mpcf_escape(mpc_val_t* x);
 mpc_val_t* mpcf_unescape(mpc_val_t* x);
 mpc_val_t* mpcf_unescape_regex(mpc_val_t* x);
 
-mpc_val_t* mpcf_strcrop(mpc_val_t* x);
-
 mpc_val_t* mpcf_fst(int n, mpc_val_t** xs);
 mpc_val_t* mpcf_snd(int n, mpc_val_t** xs);
 mpc_val_t* mpcf_trd(int n, mpc_val_t** xs);
@@ -217,13 +212,11 @@ mpc_val_t* mpcf_trd_free(int n, mpc_val_t** xs);
 mpc_val_t* mpcf_strfold(int n, mpc_val_t** xs);
 mpc_val_t* mpcf_maths(int n, mpc_val_t** xs);
 
-
 /*
-** Printing
+** Regular Expression Parsers
 */
 
-void mpc_print(mpc_parser_t* p);
-
+mpc_parser_t* mpc_re(const char* re);
   
 /*
 ** AST
@@ -236,30 +229,36 @@ typedef struct mpc_ast_t {
   struct mpc_ast_t** children;
 } mpc_ast_t;
 
-void mpc_ast_delete(mpc_ast_t* a);
 mpc_ast_t* mpc_ast_new(const char* tag, const char* contents);
 mpc_ast_t* mpc_ast_build(int n, const char* tag, ...);
-mpc_ast_t* mpc_ast_insert_root(mpc_ast_t* a);
+mpc_ast_t* mpc_ast_add_root(mpc_ast_t* a);
+mpc_ast_t* mpc_ast_add_child(mpc_ast_t* r, mpc_ast_t* a);
+mpc_ast_t* mpc_ast_add_tag(mpc_ast_t* a, const char* t);
+mpc_ast_t* mpc_ast_tag(mpc_ast_t* a, const char* t);
 
-void mpc_ast_add_child(mpc_ast_t* r, mpc_ast_t* a);
-void mpc_ast_add_tag(mpc_ast_t* a, const char* t);
-void mpc_ast_tag(mpc_ast_t* a, const char* t);
+void mpc_ast_delete(mpc_ast_t* a);
 void mpc_ast_print(mpc_ast_t* a);
+
 int mpc_ast_eq(mpc_ast_t* a, mpc_ast_t* b);
 
 mpc_val_t* mpcf_fold_ast(int n, mpc_val_t** as);
-mpc_val_t* mpcf_apply_str_ast(mpc_val_t* c);
+mpc_val_t* mpcf_str_ast(mpc_val_t* c);
 
 mpc_parser_t* mpca_tag(mpc_parser_t* a, const char* t);
 mpc_parser_t* mpca_add_tag(mpc_parser_t* a, const char* t);
+mpc_parser_t* mpca_root(mpc_parser_t* a);
 mpc_parser_t* mpca_total(mpc_parser_t* a);
+
 mpc_parser_t* mpca_not(mpc_parser_t* a);
 mpc_parser_t* mpca_maybe(mpc_parser_t* a);
+
 mpc_parser_t* mpca_many(mpc_parser_t* a);
 mpc_parser_t* mpca_many1(mpc_parser_t* a);
 mpc_parser_t* mpca_count(int n, mpc_parser_t* a);
+
 mpc_parser_t* mpca_or(int n, ...);
 mpc_parser_t* mpca_and(int n, ...);
+
 mpc_parser_t* mpca_grammar(const char* grammar, ...);
 
 mpc_err_t* mpca_lang(const char* language, ...);
@@ -267,9 +266,11 @@ mpc_err_t* mpca_lang_file(FILE* f, ...);
 mpc_err_t* mpca_lang_filename(const char* filename, ...);
 
 /*
-** Testing
+** Debug & Testing
 */
 
+void mpc_print(mpc_parser_t* p);
+
 int mpc_unmatch(mpc_parser_t* p, const char* s, void* d,
   int(*tester)(void*, void*),
   mpc_dtor_t destructor,