X-Git-Url: http://nitlanguage.org

diff --git a/c_src/opts._sep.h b/c_src/opts._sep.h
index 7673b65..20c2a16 100644
--- a/c_src/opts._sep.h
+++ b/c_src/opts._sep.h
@@ -30,25 +30,22 @@ extern const int SFT_opts[];
 #define ATTR_opts___Option____names(recv) ATTR(recv, (SFT_opts[2] + 0))
 #define ATTR_opts___Option____helptext(recv) ATTR(recv, (SFT_opts[2] + 1))
 #define ATTR_opts___Option____mandatory(recv) ATTR(recv, (SFT_opts[2] + 2))
-#define ATTR_opts___Option____context(recv) ATTR(recv, (SFT_opts[2] + 3))
-#define ATTR_opts___Option____value(recv) ATTR(recv, (SFT_opts[2] + 4))
-#define ATTR_opts___Option____default_value(recv) ATTR(recv, (SFT_opts[2] + 5))
+#define ATTR_opts___Option____value(recv) ATTR(recv, (SFT_opts[2] + 3))
+#define ATTR_opts___Option____default_value(recv) ATTR(recv, (SFT_opts[2] + 4))
 #define INIT_TABLE_POS_Option (SFT_opts[3] + 0)
 #define CALL_opts___Option___names(recv) ((opts___Option___names_t)CALL((recv), (SFT_opts[3] + 1)))
 #define CALL_opts___Option___helptext(recv) ((opts___Option___helptext_t)CALL((recv), (SFT_opts[3] + 2)))
 #define CALL_opts___Option___mandatory(recv) ((opts___Option___mandatory_t)CALL((recv), (SFT_opts[3] + 3)))
 #define CALL_opts___Option___mandatory__eq(recv) ((opts___Option___mandatory__eq_t)CALL((recv), (SFT_opts[3] + 4)))
-#define CALL_opts___Option___context(recv) ((opts___Option___context_t)CALL((recv), (SFT_opts[3] + 5)))
-#define CALL_opts___Option___context__eq(recv) ((opts___Option___context__eq_t)CALL((recv), (SFT_opts[3] + 6)))
-#define CALL_opts___Option___value(recv) ((opts___Option___value_t)CALL((recv), (SFT_opts[3] + 7)))
-#define CALL_opts___Option___value__eq(recv) ((opts___Option___value__eq_t)CALL((recv), (SFT_opts[3] + 8)))
-#define CALL_opts___Option___default_value(recv) ((opts___Option___default_value_t)CALL((recv), (SFT_opts[3] + 9)))
-#define CALL_opts___Option___default_value__eq(recv) ((opts___Option___default_value__eq_t)CALL((recv), (SFT_opts[3] + 10)))
-#define CALL_opts___Option___init_opt(recv) ((opts___Option___init_opt_t)CALL((recv), (SFT_opts[3] + 11)))
-#define CALL_opts___Option___add_aliases(recv) ((opts___Option___add_aliases_t)CALL((recv), (SFT_opts[3] + 12)))
-#define CALL_opts___Option___pretty(recv) ((opts___Option___pretty_t)CALL((recv), (SFT_opts[3] + 13)))
-#define CALL_opts___Option___pretty_default(recv) ((opts___Option___pretty_default_t)CALL((recv), (SFT_opts[3] + 14)))
-#define CALL_opts___Option___read_param(recv) ((opts___Option___read_param_t)CALL((recv), (SFT_opts[3] + 15)))
+#define CALL_opts___Option___value__eq(recv) ((opts___Option___value__eq_t)CALL((recv), (SFT_opts[3] + 5)))
+#define CALL_opts___Option___value(recv) ((opts___Option___value_t)CALL((recv), (SFT_opts[3] + 6)))
+#define CALL_opts___Option___default_value(recv) ((opts___Option___default_value_t)CALL((recv), (SFT_opts[3] + 7)))
+#define CALL_opts___Option___default_value__eq(recv) ((opts___Option___default_value__eq_t)CALL((recv), (SFT_opts[3] + 8)))
+#define CALL_opts___Option___init_opt(recv) ((opts___Option___init_opt_t)CALL((recv), (SFT_opts[3] + 9)))
+#define CALL_opts___Option___add_aliases(recv) ((opts___Option___add_aliases_t)CALL((recv), (SFT_opts[3] + 10)))
+#define CALL_opts___Option___pretty(recv) ((opts___Option___pretty_t)CALL((recv), (SFT_opts[3] + 11)))
+#define CALL_opts___Option___pretty_default(recv) ((opts___Option___pretty_default_t)CALL((recv), (SFT_opts[3] + 12)))
+#define CALL_opts___Option___read_param(recv) ((opts___Option___read_param_t)CALL((recv), (SFT_opts[3] + 13)))
 #define ID_OptionText (SFT_opts[4])
 #define COLOR_OptionText (SFT_opts[5])
 #define INIT_TABLE_POS_OptionText (SFT_opts[6] + 0)
@@ -98,143 +95,137 @@ extern const int SFT_opts[];
 #define CALL_opts___OptionContext___add_option(recv) ((opts___OptionContext___add_option_t)CALL((recv), (SFT_opts[33] + 6)))
 #define CALL_opts___OptionContext___init(recv) ((opts___OptionContext___init_t)CALL((recv), (SFT_opts[33] + 7)))
 #define CALL_opts___OptionContext___build(recv) ((opts___OptionContext___build_t)CALL((recv), (SFT_opts[33] + 8)))
-typedef val_t (* opts___Option___to_s_t)(val_t  self);
-val_t opts___Option___to_s(val_t  self);
 #define LOCATE_opts___Option___to_s "opts::Option::(string::Object::to_s)"
-typedef val_t (* opts___Option___names_t)(val_t  self);
-val_t opts___Option___names(val_t  self);
+val_t opts___Option___to_s(val_t p0);
+typedef val_t (*opts___Option___to_s_t)(val_t p0);
 #define LOCATE_opts___Option___names "opts::Option::names"
-typedef val_t (* opts___Option___helptext_t)(val_t  self);
-val_t opts___Option___helptext(val_t  self);
+val_t opts___Option___names(val_t p0);
+typedef val_t (*opts___Option___names_t)(val_t p0);
 #define LOCATE_opts___Option___helptext "opts::Option::helptext"
-typedef val_t (* opts___Option___mandatory_t)(val_t  self);
-val_t opts___Option___mandatory(val_t  self);
+val_t opts___Option___helptext(val_t p0);
+typedef val_t (*opts___Option___helptext_t)(val_t p0);
 #define LOCATE_opts___Option___mandatory "opts::Option::mandatory"
-typedef void (* opts___Option___mandatory__eq_t)(val_t  self, val_t  param0);
-void opts___Option___mandatory__eq(val_t  self, val_t  param0);
+val_t opts___Option___mandatory(val_t p0);
+typedef val_t (*opts___Option___mandatory_t)(val_t p0);
 #define LOCATE_opts___Option___mandatory__eq "opts::Option::mandatory="
-typedef val_t (* opts___Option___context_t)(val_t  self);
-val_t opts___Option___context(val_t  self);
-#define LOCATE_opts___Option___context "opts::Option::context"
-typedef void (* opts___Option___context__eq_t)(val_t  self, val_t  param0);
-void opts___Option___context__eq(val_t  self, val_t  param0);
-#define LOCATE_opts___Option___context__eq "opts::Option::context="
-typedef val_t (* opts___Option___value_t)(val_t  self);
-val_t opts___Option___value(val_t  self);
-#define LOCATE_opts___Option___value "opts::Option::value"
-typedef void (* opts___Option___value__eq_t)(val_t  self, val_t  param0);
-void opts___Option___value__eq(val_t  self, val_t  param0);
+void opts___Option___mandatory__eq(val_t p0, val_t p1);
+typedef void (*opts___Option___mandatory__eq_t)(val_t p0, val_t p1);
 #define LOCATE_opts___Option___value__eq "opts::Option::value="
-typedef val_t (* opts___Option___default_value_t)(val_t  self);
-val_t opts___Option___default_value(val_t  self);
+void opts___Option___value__eq(val_t p0, val_t p1);
+typedef void (*opts___Option___value__eq_t)(val_t p0, val_t p1);
+#define LOCATE_opts___Option___value "opts::Option::value"
+val_t opts___Option___value(val_t p0);
+typedef val_t (*opts___Option___value_t)(val_t p0);
 #define LOCATE_opts___Option___default_value "opts::Option::default_value"
-typedef void (* opts___Option___default_value__eq_t)(val_t  self, val_t  param0);
-void opts___Option___default_value__eq(val_t  self, val_t  param0);
+val_t opts___Option___default_value(val_t p0);
+typedef val_t (*opts___Option___default_value_t)(val_t p0);
 #define LOCATE_opts___Option___default_value__eq "opts::Option::default_value="
-typedef void (* opts___Option___init_opt_t)(val_t  self, val_t  param0, val_t  param1, val_t  param2, int* init_table);
-void opts___Option___init_opt(val_t  self, val_t  param0, val_t  param1, val_t  param2, int* init_table);
+void opts___Option___default_value__eq(val_t p0, val_t p1);
+typedef void (*opts___Option___default_value__eq_t)(val_t p0, val_t p1);
 #define LOCATE_opts___Option___init_opt "opts::Option::init_opt"
+void opts___Option___init_opt(val_t p0, val_t p1, val_t p2, val_t p3, int* init_table);
+typedef void (*opts___Option___init_opt_t)(val_t p0, val_t p1, val_t p2, val_t p3, int* init_table);
 val_t NEW_Option_opts___Option___init_opt(val_t p0, val_t p1, val_t p2);
-typedef void (* opts___Option___add_aliases_t)(val_t  self, val_t  param0);
-void opts___Option___add_aliases(val_t  self, val_t  param0);
 #define LOCATE_opts___Option___add_aliases "opts::Option::add_aliases"
-typedef val_t (* opts___Option___pretty_t)(val_t  self, val_t  param0);
-val_t opts___Option___pretty(val_t  self, val_t  param0);
+void opts___Option___add_aliases(val_t p0, val_t p1);
+typedef void (*opts___Option___add_aliases_t)(val_t p0, val_t p1);
 #define LOCATE_opts___Option___pretty "opts::Option::pretty"
-typedef val_t (* opts___Option___pretty_default_t)(val_t  self);
-val_t opts___Option___pretty_default(val_t  self);
+val_t opts___Option___pretty(val_t p0, val_t p1);
+typedef val_t (*opts___Option___pretty_t)(val_t p0, val_t p1);
 #define LOCATE_opts___Option___pretty_default "opts::Option::pretty_default"
-typedef void (* opts___Option___read_param_t)(val_t  self, val_t  param0);
-void opts___Option___read_param(val_t  self, val_t  param0);
+val_t opts___Option___pretty_default(val_t p0);
+typedef val_t (*opts___Option___pretty_default_t)(val_t p0);
 #define LOCATE_opts___Option___read_param "opts::Option::read_param"
-typedef val_t (* opts___OptionText___to_s_t)(val_t  self);
-val_t opts___OptionText___to_s(val_t  self);
+void opts___Option___read_param(val_t p0, val_t p1);
+typedef void (*opts___Option___read_param_t)(val_t p0, val_t p1);
 #define LOCATE_opts___OptionText___to_s "opts::OptionText::(string::Object::to_s)"
-typedef val_t (* opts___OptionText___pretty_t)(val_t  self, val_t  param0);
-val_t opts___OptionText___pretty(val_t  self, val_t  param0);
+val_t opts___OptionText___to_s(val_t p0);
+typedef val_t (*opts___OptionText___to_s_t)(val_t p0);
 #define LOCATE_opts___OptionText___pretty "opts::OptionText::(opts::Option::pretty)"
-typedef void (* opts___OptionText___init_t)(val_t  self, val_t  param0, int* init_table);
-void opts___OptionText___init(val_t  self, val_t  param0, int* init_table);
+val_t opts___OptionText___pretty(val_t p0, val_t p1);
+typedef val_t (*opts___OptionText___pretty_t)(val_t p0, val_t p1);
 #define LOCATE_opts___OptionText___init "opts::OptionText::init"
+void opts___OptionText___init(val_t p0, val_t p1, int* init_table);
+typedef void (*opts___OptionText___init_t)(val_t p0, val_t p1, int* init_table);
 val_t NEW_OptionText_opts___OptionText___init(val_t p0);
-typedef void (* opts___OptionBool___read_param_t)(val_t  self, val_t  param0);
-void opts___OptionBool___read_param(val_t  self, val_t  param0);
 #define LOCATE_opts___OptionBool___read_param "opts::OptionBool::(opts::Option::read_param)"
-typedef void (* opts___OptionBool___init_t)(val_t  self, val_t  param0, val_t  param1, int* init_table);
-void opts___OptionBool___init(val_t  self, val_t  param0, val_t  param1, int* init_table);
+void opts___OptionBool___read_param(val_t p0, val_t p1);
+typedef void (*opts___OptionBool___read_param_t)(val_t p0, val_t p1);
 #define LOCATE_opts___OptionBool___init "opts::OptionBool::init"
+void opts___OptionBool___init(val_t p0, val_t p1, val_t p2, int* init_table);
+typedef void (*opts___OptionBool___init_t)(val_t p0, val_t p1, val_t p2, int* init_table);
 val_t NEW_OptionBool_opts___OptionBool___init(val_t p0, val_t p1);
-typedef void (* opts___OptionCount___read_param_t)(val_t  self, val_t  param0);
-void opts___OptionCount___read_param(val_t  self, val_t  param0);
 #define LOCATE_opts___OptionCount___read_param "opts::OptionCount::(opts::Option::read_param)"
-typedef void (* opts___OptionCount___init_t)(val_t  self, val_t  param0, val_t  param1, int* init_table);
-void opts___OptionCount___init(val_t  self, val_t  param0, val_t  param1, int* init_table);
+void opts___OptionCount___read_param(val_t p0, val_t p1);
+typedef void (*opts___OptionCount___read_param_t)(val_t p0, val_t p1);
 #define LOCATE_opts___OptionCount___init "opts::OptionCount::init"
+void opts___OptionCount___init(val_t p0, val_t p1, val_t p2, int* init_table);
+typedef void (*opts___OptionCount___init_t)(val_t p0, val_t p1, val_t p2, int* init_table);
 val_t NEW_OptionCount_opts___OptionCount___init(val_t p0, val_t p1);
-typedef void (* opts___OptionParameter___read_param_t)(val_t  self, val_t  param0);
-void opts___OptionParameter___read_param(val_t  self, val_t  param0);
 #define LOCATE_opts___OptionParameter___read_param "opts::OptionParameter::(opts::Option::read_param)"
-typedef val_t (* opts___OptionParameter___convert_t)(val_t  self, val_t  param0);
-val_t opts___OptionParameter___convert(val_t  self, val_t  param0);
+void opts___OptionParameter___read_param(val_t p0, val_t p1);
+typedef void (*opts___OptionParameter___read_param_t)(val_t p0, val_t p1);
 #define LOCATE_opts___OptionParameter___convert "opts::OptionParameter::convert"
-typedef void (* opts___OptionParameter___init_opt_t)(val_t  self, val_t  param0, val_t  param1, val_t  param2, int* init_table);
-void opts___OptionParameter___init_opt(val_t  self, val_t  param0, val_t  param1, val_t  param2, int* init_table);
+val_t opts___OptionParameter___convert(val_t p0, val_t p1);
+typedef val_t (*opts___OptionParameter___convert_t)(val_t p0, val_t p1);
 #define LOCATE_opts___OptionParameter___init_opt "opts::OptionParameter::init_opt"
+void opts___OptionParameter___init_opt(val_t p0, val_t p1, val_t p2, val_t p3, int* init_table);
+typedef void (*opts___OptionParameter___init_opt_t)(val_t p0, val_t p1, val_t p2, val_t p3, int* init_table);
 val_t NEW_OptionParameter_opts___OptionParameter___init_opt(val_t p0, val_t p1, val_t p2);
-typedef val_t (* opts___OptionString___convert_t)(val_t  self, val_t  param0);
-val_t opts___OptionString___convert(val_t  self, val_t  param0);
 #define LOCATE_opts___OptionString___convert "opts::OptionString::(opts::OptionParameter::convert)"
-typedef void (* opts___OptionString___init_t)(val_t  self, val_t  param0, val_t  param1, int* init_table);
-void opts___OptionString___init(val_t  self, val_t  param0, val_t  param1, int* init_table);
+val_t opts___OptionString___convert(val_t p0, val_t p1);
+typedef val_t (*opts___OptionString___convert_t)(val_t p0, val_t p1);
 #define LOCATE_opts___OptionString___init "opts::OptionString::init"
+void opts___OptionString___init(val_t p0, val_t p1, val_t p2, int* init_table);
+typedef void (*opts___OptionString___init_t)(val_t p0, val_t p1, val_t p2, int* init_table);
 val_t NEW_OptionString_opts___OptionString___init(val_t p0, val_t p1);
-typedef val_t (* opts___OptionEnum___pretty_default_t)(val_t  self);
-val_t opts___OptionEnum___pretty_default(val_t  self);
 #define LOCATE_opts___OptionEnum___pretty_default "opts::OptionEnum::(opts::Option::pretty_default)"
-typedef val_t (* opts___OptionEnum___convert_t)(val_t  self, val_t  param0);
-val_t opts___OptionEnum___convert(val_t  self, val_t  param0);
+val_t opts___OptionEnum___pretty_default(val_t p0);
+typedef val_t (*opts___OptionEnum___pretty_default_t)(val_t p0);
 #define LOCATE_opts___OptionEnum___convert "opts::OptionEnum::(opts::OptionParameter::convert)"
-typedef void (* opts___OptionEnum___init_t)(val_t  self, val_t  param0, val_t  param1, val_t  param2, val_t  param3, int* init_table);
-void opts___OptionEnum___init(val_t  self, val_t  param0, val_t  param1, val_t  param2, val_t  param3, int* init_table);
+val_t opts___OptionEnum___convert(val_t p0, val_t p1);
+typedef val_t (*opts___OptionEnum___convert_t)(val_t p0, val_t p1);
 #define LOCATE_opts___OptionEnum___init "opts::OptionEnum::init"
+void opts___OptionEnum___init(val_t p0, val_t p1, val_t p2, val_t p3, val_t p4, int* init_table);
+typedef void (*opts___OptionEnum___init_t)(val_t p0, val_t p1, val_t p2, val_t p3, val_t p4, int* init_table);
 val_t NEW_OptionEnum_opts___OptionEnum___init(val_t p0, val_t p1, val_t p2, val_t p3);
-typedef val_t (* opts___OptionInt___convert_t)(val_t  self, val_t  param0);
-val_t opts___OptionInt___convert(val_t  self, val_t  param0);
 #define LOCATE_opts___OptionInt___convert "opts::OptionInt::(opts::OptionParameter::convert)"
-typedef void (* opts___OptionInt___init_t)(val_t  self, val_t  param0, val_t  param1, val_t  param2, int* init_table);
-void opts___OptionInt___init(val_t  self, val_t  param0, val_t  param1, val_t  param2, int* init_table);
+val_t opts___OptionInt___convert(val_t p0, val_t p1);
+typedef val_t (*opts___OptionInt___convert_t)(val_t p0, val_t p1);
 #define LOCATE_opts___OptionInt___init "opts::OptionInt::init"
+void opts___OptionInt___init(val_t p0, val_t p1, val_t p2, val_t p3, int* init_table);
+typedef void (*opts___OptionInt___init_t)(val_t p0, val_t p1, val_t p2, val_t p3, int* init_table);
 val_t NEW_OptionInt_opts___OptionInt___init(val_t p0, val_t p1, val_t p2);
-typedef val_t (* opts___OptionArray___convert_t)(val_t  self, val_t  param0);
-val_t opts___OptionArray___convert(val_t  self, val_t  param0);
 #define LOCATE_opts___OptionArray___convert "opts::OptionArray::(opts::OptionParameter::convert)"
-typedef void (* opts___OptionArray___init_t)(val_t  self, val_t  param0, val_t  param1, int* init_table);
-void opts___OptionArray___init(val_t  self, val_t  param0, val_t  param1, int* init_table);
+val_t opts___OptionArray___convert(val_t p0, val_t p1);
+typedef val_t (*opts___OptionArray___convert_t)(val_t p0, val_t p1);
 #define LOCATE_opts___OptionArray___init "opts::OptionArray::init"
+void opts___OptionArray___init(val_t p0, val_t p1, val_t p2, int* init_table);
+typedef void (*opts___OptionArray___init_t)(val_t p0, val_t p1, val_t p2, int* init_table);
 val_t NEW_OptionArray_opts___OptionArray___init(val_t p0, val_t p1);
-typedef val_t (* opts___OptionContext___options_t)(val_t  self);
-val_t opts___OptionContext___options(val_t  self);
 #define LOCATE_opts___OptionContext___options "opts::OptionContext::options"
-typedef val_t (* opts___OptionContext___rest_t)(val_t  self);
-val_t opts___OptionContext___rest(val_t  self);
+val_t opts___OptionContext___options(val_t p0);
+typedef val_t (*opts___OptionContext___options_t)(val_t p0);
 #define LOCATE_opts___OptionContext___rest "opts::OptionContext::rest"
-typedef void (* opts___OptionContext___usage_t)(val_t  self);
-void opts___OptionContext___usage(val_t  self);
+val_t opts___OptionContext___rest(val_t p0);
+typedef val_t (*opts___OptionContext___rest_t)(val_t p0);
 #define LOCATE_opts___OptionContext___usage "opts::OptionContext::usage"
-typedef void (* opts___OptionContext___parse_t)(val_t  self, val_t  param0);
-void opts___OptionContext___parse(val_t  self, val_t  param0);
+void opts___OptionContext___usage(val_t p0);
+typedef void (*opts___OptionContext___usage_t)(val_t p0);
 #define LOCATE_opts___OptionContext___parse "opts::OptionContext::parse"
-typedef void (* opts___OptionContext___parse_intern_t)(val_t  self, val_t  param0);
-void opts___OptionContext___parse_intern(val_t  self, val_t  param0);
+void opts___OptionContext___parse(val_t p0, val_t p1);
+typedef void (*opts___OptionContext___parse_t)(val_t p0, val_t p1);
 #define LOCATE_opts___OptionContext___parse_intern "opts::OptionContext::parse_intern"
-typedef void (* opts___OptionContext___add_option_t)(val_t  self, val_t  param0);
-void opts___OptionContext___add_option(val_t  self, val_t  param0);
+void opts___OptionContext___parse_intern(val_t p0, val_t p1);
+typedef void (*opts___OptionContext___parse_intern_t)(val_t p0, val_t p1);
 #define LOCATE_opts___OptionContext___add_option "opts::OptionContext::add_option"
-typedef void (* opts___OptionContext___init_t)(val_t  self, int* init_table);
-void opts___OptionContext___init(val_t  self, int* init_table);
+void opts___OptionContext___add_option(val_t p0, val_t p1);
+typedef void (*opts___OptionContext___add_option_t)(val_t p0, val_t p1);
 #define LOCATE_opts___OptionContext___init "opts::OptionContext::init"
+void opts___OptionContext___init(val_t p0, int* init_table);
+typedef void (*opts___OptionContext___init_t)(val_t p0, int* init_table);
 val_t NEW_OptionContext_opts___OptionContext___init();
-typedef void (* opts___OptionContext___build_t)(val_t  self);
-void opts___OptionContext___build(val_t  self);
 #define LOCATE_opts___OptionContext___build "opts::OptionContext::build"
+void opts___OptionContext___build(val_t p0);
+typedef void (*opts___OptionContext___build_t)(val_t p0);
 #endif