rtyler
/
pyparsley
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

arrays partially reworked

This commit is contained in:
Kyle Maxwell 2008-12-20 15:43:05 -08:00
parent 1f796d75d9
commit ad28096824
5 changed files with 109 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

119
dexter.c
View File

@ -142,41 +142,100 @@ void * __dex_alloc(int size) {
}
void __dex_recurse_object(struct json_object * json, struct printbuf* buf, char *context) {
char *tag;
char *ptr;
char *expr;
int offset;
bool has_expr;
json_object_object_foreach(json, key, val) {
offset = 0;
tag = astrdup(key);
expr = astrdup(key);
ptr = tag;
has_expr = false;
while(*ptr++ != '\0'){
offset++;
if(*ptr == '(') {
*ptr = 0;
has_expr = true;
break;
}
}
expr += offset;
sprintbuf(buf, "<%s>\n", tag);
if(has_expr) sprintbuf(buf, "<dexter:groups><xsl:for-each select=\"%s\">\n", myparse(expr));
__dex_recurse(val, buf, astrcat3(context, ".", tag));
if(has_expr) sprintbuf(buf, "</xsl:for-each></dexter:groups>\n");
sprintbuf(buf, "</%s>\n", tag);
__dex_recurse_foreach(json, key, val, buf, context);
}
}
void __dex_recurse_foreach(struct json_object * json, char* key, struct json_object * val, struct printbuf* buf, char *context) {
char *tag = astrdup(key);;
char *ptr = tag;
char *expr = astrdup(key);;
int offset = 0;
bool has_expr = false;
struct json_object * inner;
while(*ptr++ != '\0'){
offset++;
if(*ptr == '(') {
*ptr = 0;
has_expr = true;
break;
}
}
expr += offset;
sprintbuf(buf, "<%s>\n", tag);
switch(json_object_get_type(val)) {
case json_type_array:
printf("arr");
inner = json_object_array_get_idx(val, 0);
switch(json_object_get_type(inner)) {
case json_type_string:
if(has_expr) {
sprintbuf(buf, "<dexter:groups><xsl:for-each select=\"%s\"><dexter:group>\n", myparse(expr));
__dex_recurse(inner, buf, astrcat3(context, ".", tag));
} else {
sprintbuf(buf, "<dexter:groups><xsl:for-each select=\"%s\"><dexter:group>\n", myparse(json_object_get_string(inner)));
struct json_object * dot = json_object_new_string(".");
__dex_recurse(dot, buf, astrcat3(context, ".", tag));
}
sprintbuf(buf, "</dexter:group></xsl:for-each></dexter:groups>\n");
break;
case json_type_object:
break;
}
break;
case json_type_string:
printf("str");
break;
case json_type_object:
printf("obj");
break;
};
sprintbuf(buf, "</%s>\n", tag);
// char *tag;
// char *ptr;
// char *expr;
// int offset;
// bool has_expr;
// int is_arr;
// int is_simple_arr;
// offset = 0;
// tag = astrdup(key);
// expr = astrdup(key);
// ptr = tag;
// has_expr = false;
// while(*ptr++ != '\0'){
// offset++;
// if(*ptr == '(') {
// *ptr = 0;
// has_expr = true;
// break;
// }
// }
// expr += offset;
//
// if(!has_expr) expr = ".";
// if(is_arr = json_object_is_type(val, json_type_array) ) {
// struct json_object * inner = json_object_array_get_idx(val, 0);
// if(is_simple_arr = json_object_is_type(inner, json_type_string)) {
// expr = json_object_get_string(inner);
// }
// }
//
// sprintbuf(buf, "<%s>\n", tag);
// if(is_arr) sprintbuf(buf, "<dexter:groups><xsl:for-each select=\"%s\">\n", myparse(expr));
// __dex_recurse(val, buf, astrcat3(context, ".", tag));
// if(is_arr) sprintbuf(buf, "</xsl:for-each></dexter:groups>\n");
// sprintbuf(buf, "</%s>\n", tag);
}
void __dex_recurse_array(struct json_object * json, struct printbuf* buf, char *context) {
for(int i = 0; i < json_object_array_length(json); i++) {
sprintbuf(buf, "<dexter:group>\n");
__dex_recurse(json_object_array_get_idx(json, i), buf, context);
sprintbuf(buf, "</dexter:group>\n");
}
printf("WTF!!!!!!!\n");
}
void __dex_recurse_string(struct json_object * json, struct printbuf* buf, char *context) {

1
dexter.h
View File

@ -39,5 +39,6 @@ static void __dex_recurse(struct json_object *, struct printbuf*, char*);
static void __dex_recurse_object(struct json_object *, struct printbuf*, char*);
static void __dex_recurse_array(struct json_object *, struct printbuf*, char*);
static void __dex_recurse_string(struct json_object *, struct printbuf*, char*);
static void __dex_recurse_foreach(struct json_object *, char *, struct json_object *, struct printbuf *, char *);
#endif

11
dexter_main.c
View File

@ -32,10 +32,15 @@ int main (int argc, char **argv) {
printbuf_file_read(fd, buf);
dexPtr dex = dex_compile(buf->buf, "");
printf("hi\n");
xmlDocPtr xml = dex_parse_file(dex, argv[2], 1);
struct json_object *json = xml2json(xml->children->children);
printf("%s\n", json_object_to_json_string(json));
printf("%s\n", xml);
printf("%s\n", dex->error);
// struct json_object *json = xml2json(xml->children->children);
// printf("%s\n", json_object_to_json_string(json));
xmlSaveFile("-", xml);
return 0;
}

3
fixtures/li.dex Normal file
View File

@ -0,0 +1,3 @@
{
"foo": ["li"]
}

16
ruby/test/test_dexterous.rb
View File

@ -27,12 +27,12 @@ class TestDexterous < Test::Unit::TestCase
@nonexistant_file = File.dirname(__FILE__) + "/../fixtures/yelp.html"
assert_equal({"hi" => "Nick's Crispy Tacos"}, @dex.parse(:file => @nonexistant_file)) rescue nil
end
#
# def test_array_string
# @dex = Dexterous.new({"foo" => ["li"]})
# out = @dex.parse(:file => @file)
# assert_kind_of Hash, out
# assert_kind_of Array, out["foo"], out.inspect
# assert out["foo"].length > 1
# end
def test_array_string
@dex = Dexterous.new({"foo" => ["li"]})
out = @dex.parse(:file => @file)
assert_kind_of Hash, out
assert_kind_of Array, out["foo"], out.inspect
assert out["foo"].length > 1
end
end