Updated testing framework

mpc.h

@@ -22,6 +22,7 @@ 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);
 
 void mpc_err_delete(mpc_err_t* x);
 void mpc_err_print(mpc_err_t* x);
@@ -42,10 +43,21 @@ typedef union {
 struct mpc_parser_t;
 typedef struct mpc_parser_t mpc_parser_t;
 
-bool mpc_parse(const char* s, mpc_parser_t* p, mpc_result_t* r);
-bool mpc_parse_file(FILE* f, mpc_parser_t* p, mpc_result_t* r);
+bool mpc_parse(const char* filename, const char* s, mpc_parser_t* p, mpc_result_t* r);
+bool mpc_parse_file(const char* filename, FILE* f, mpc_parser_t* p, mpc_result_t* r);
 bool mpc_parse_filename(const char* filename, mpc_parser_t* p, mpc_result_t* r);
 
+/*
+** Function Types
+*/
+
+typedef void(*mpc_dtor_t)(mpc_val_t*);
+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)(mpc_val_t*,mpc_val_t*);
+typedef mpc_val_t*(*mpc_afold_t)(int,mpc_val_t**);
+typedef mpc_val_t*(*mpc_lift_t)(void);
+
 /*
 ** Building a Parser
 */
@@ -56,11 +68,11 @@ mpc_parser_t* mpc_new(void);
 mpc_parser_t* mpc_define(mpc_parser_t* p, mpc_parser_t* a);
 mpc_parser_t* mpc_undefine(mpc_parser_t* p);
 
-mpc_parser_t* mpc_expect(mpc_parser_t* a, const char* expected);
-
 mpc_parser_t* mpc_pass(void);
 mpc_parser_t* mpc_fail(void);
-mpc_parser_t* mpc_lift(mpc_val_t* x);
+mpc_parser_t* mpc_lift(mpc_lift_t f);
+mpc_parser_t* mpc_lift_val(mpc_val_t* x);
+mpc_parser_t* mpc_expect(mpc_parser_t* a, const char* expected);
 
 /*
 ** Basic Parsers
@@ -74,31 +86,28 @@ mpc_parser_t* mpc_noneof(const char* s);
 mpc_parser_t* mpc_satisfy(bool(*f)(char));
 mpc_parser_t* mpc_string(const char* s);
 
-/*
-** Function Types
-*/
-
-typedef void (*mpc_dtor_t)(mpc_val_t*);
-typedef mpc_val_t*(*mpc_apply_t)(mpc_val_t*);
-typedef mpc_val_t*(*mpc_fold_t)(mpc_val_t*,mpc_val_t*);
-typedef mpc_val_t*(*mpc_afold_t)(int,mpc_val_t**);
-
-void mpc_dtor_null(mpc_val_t* x);
-
 /*
 ** Core Parsers
 */
 
 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_not(mpc_parser_t* a, mpc_dtor_t da);
+mpc_parser_t* mpc_not_else(mpc_parser_t* a, mpc_dtor_t da, mpc_lift_t lf);
 mpc_parser_t* mpc_maybe(mpc_parser_t* a);
+mpc_parser_t* mpc_maybe_else(mpc_parser_t* a, mpc_lift_t lf);
 mpc_parser_t* mpc_many(mpc_parser_t* a, mpc_fold_t f);
+mpc_parser_t* mpc_many_else(mpc_parser_t* a, mpc_fold_t f, mpc_lift_t lf);
 mpc_parser_t* mpc_many1(mpc_parser_t* a, mpc_fold_t f);
 mpc_parser_t* mpc_count(mpc_parser_t* a, mpc_dtor_t da, mpc_fold_t f, int n);
-mpc_parser_t* mpc_either(mpc_parser_t* a, mpc_parser_t* b);
+mpc_parser_t* mpc_count_else(mpc_parser_t* a, mpc_dtor_t da, mpc_fold_t f, int n, mpc_lift_t lf);
+mpc_parser_t* mpc_else(mpc_parser_t* a, mpc_parser_t* b);
 mpc_parser_t* mpc_also(mpc_parser_t* a, mpc_parser_t* b, mpc_dtor_t da, mpc_fold_t f);
 mpc_parser_t* mpc_bind(mpc_parser_t* a, mpc_parser_t* b, mpc_dtor_t da, mpc_fold_t f);
 mpc_parser_t* mpc_or(int n, ...);
 mpc_parser_t* mpc_and(int n, mpc_afold_t f, ...);
+mpc_parser_t* mpc_or_va(int n, va_list va);
+mpc_parser_t* mpc_and_va(int n, mpc_afold_t f, va_list va);
 
 /*
 ** Common Parsers
@@ -124,12 +133,14 @@ mpc_parser_t* mpc_lower(void);
 mpc_parser_t* mpc_upper(void);
 mpc_parser_t* mpc_alpha(void);
 mpc_parser_t* mpc_underscore(void);
+mpc_parser_t* mpc_alphanum(void);
 
 mpc_parser_t* mpc_int(void);
 mpc_parser_t* mpc_hex(void);
 mpc_parser_t* mpc_oct(void);
 mpc_parser_t* mpc_number(void);
 
+mpc_parser_t* mpc_real(void);
 mpc_parser_t* mpc_float(void);
 
 mpc_parser_t* mpc_semi(void);
@@ -168,11 +179,17 @@ mpc_parser_t* mpc_re(const char* re);
 ** Common Fold Functions
 */
 
+void mpcf_dtor_null(mpc_val_t* x);
+mpc_val_t* mpcf_lift_null(void);
+mpc_val_t* mpcf_lift_emptystr(void);
+
 mpc_val_t* mpcf_free(mpc_val_t* x);
 mpc_val_t* mpcf_int(mpc_val_t* x);
 mpc_val_t* mpcf_hex(mpc_val_t* x);
 mpc_val_t* mpcf_oct(mpc_val_t* x);
+mpc_val_t* mpcf_float(mpc_val_t* x);
 mpc_val_t* mpcf_escape(mpc_val_t* x);
+mpc_val_t* mpcf_unescape(mpc_val_t* x);
 
 mpc_val_t* mpcf_fst(mpc_val_t* x, mpc_val_t* y);
 mpc_val_t* mpcf_snd(mpc_val_t* x, mpc_val_t* y);
@@ -183,6 +200,7 @@ mpc_val_t* mpcf_snd_free(mpc_val_t* x, mpc_val_t* y);
 mpc_val_t* mpcf_freefold(mpc_val_t* t, mpc_val_t* x);
 mpc_val_t* mpcf_strfold(mpc_val_t* t, mpc_val_t* x);
 
+mpc_val_t* mpcf_astrfold(int n, mpc_val_t** xs);
 mpc_val_t* mpcf_between_free(int n, mpc_val_t** xs);
 mpc_val_t* mpcf_maths(int n, mpc_val_t** xs);
 
@@ -193,13 +211,59 @@ mpc_val_t* mpcf_maths(int n, mpc_val_t** xs);
 
 void mpc_print(mpc_parser_t* p);
 
+
 /*
 ** Testing
 */
 
-bool mpc_test(mpc_parser_t* p, const char* input, void* data,
-  bool(*tester)(void*, void*), 
-  void(*destructor)(void*), 
+bool mpc_unmatch(mpc_parser_t* p, const char* s, void* d,
+  bool(*tester)(void*, void*),
+  mpc_dtor_t destructor,
   void(*printer)(void*));
 
+bool mpc_match(mpc_parser_t* p, const char* s, void* d,
+  bool(*tester)(void*, void*), 
+  mpc_dtor_t destructor, 
+  void(*printer)(void*));
+
+  
+/*
+** AST
+*/
+
+typedef struct mpc_ast_t {
+  int tag;
+  char* contents;
+  int children_num;
+  struct mpc_ast_t** children;
+} mpc_ast_t;
+
+void mpc_ast_delete(mpc_ast_t* a);
+mpc_ast_t* mpc_ast_empty(void);
+mpc_ast_t* mpc_ast_new(char* contents);
+
+void mpc_ast_add_child(mpc_ast_t* r, mpc_ast_t* a);
+mpc_ast_t* mpc_ast_tag(mpc_ast_t* a, int t);
+void mpc_ast_print(mpc_ast_t* a);
+
+mpc_val_t* mpcf_fold_ast(mpc_val_t* a, mpc_val_t* b);
+mpc_val_t* mpcf_afold_ast(int n, mpc_val_t** as);
+mpc_val_t* mpcf_apply_str_ast(mpc_val_t* c);
+mpc_val_t* mpcf_lift_ast(void);
+
+mpc_parser_t* mpc_ast(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(mpc_parser_t* a, int n);
+mpc_parser_t* mpca_else(mpc_parser_t* a, mpc_parser_t* b);
+mpc_parser_t* mpca_also(mpc_parser_t* a, mpc_parser_t* b);
+mpc_parser_t* mpca_bind(mpc_parser_t* a, mpc_parser_t* b);
+mpc_parser_t* mpca_or(int n, ...);
+mpc_parser_t* mpca_and(int n, ...);
+mpc_parser_t* mpca_ends(mpc_parser_t* a);
+mpc_parser_t* mpca_grammar(const char* grammar, ...);
+
 #endif