Labyricorn/liquid
1
0
Fork 0
mirror of https://github.com/Shopify/liquid.git synced 2026-09-15 08:50:45 -07:00
Code Issues Packages Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
Isha
2014-03-03 01:02:18 +00:00
parent 02525f258e
commit 16d5f40474
2 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/liquid/variable.c
+22 -10
View File
@@ -62,7 +62,7 @@ static char * get_quoted_fragment(char * cursor, int len, VALUE self)
} }
if (count == len && start != -1 && end == -1) end = len-1; if (count == len && start != -1 && end == -1) end = len-1;
form_name: form_name:
if (end > start) { if (end > start) {
rb_iv_set(self, "@name", rb_str_new(&cursor[start], end-start+1)); rb_iv_set(self, "@name", rb_str_new(&cursor[start], end-start+1));
return &cursor[end+1]; return &cursor[end+1];
@@ -72,30 +72,42 @@ form_name:
} }
} }
static void rb_variable_lax_parse_new(VALUE self, VALUE m) static VALUE get_filters(char * cursor, int len, VALUE self) {
int count = 0;
while(count<len) {
if (cursor[count] == '|') {
count += skip_whitespace(&cursor[count]+1, len-count);
}
}
return self;
}
static void rb_variable_lax_parse(VALUE self, VALUE m)
{ {
char * markup = RSTRING_PTR(m); char * markup = RSTRING_PTR(m);
int markup_len = RSTRING_LEN(m); int markup_len = RSTRING_LEN(m);
char * cursor = markup; int count = 0; char * cursor = markup; int count = 0; VALUE filters;
/* Extract name */ /* Extract name */
count += skip_whitespace(markup, markup_len); count += skip_whitespace(markup, markup_len);
cursor = markup+count; cursor = markup+count;
cursor = get_quoted_fragment(cursor, markup_len-count, self); cursor = get_quoted_fragment(cursor, markup_len-count, self);
// if (*name == NULL) rb_iv_set(self, "@name", Qnil); if (cursor == NULL) {filters = rb_ary_new(); rb_iv_set(self, "@filters", filters);}
// else else
// { {
// rb_iv_set(self, "@name", rb_str_new2(*name)); /* Extract filters */
filters = get_filters(cursor, (markup-cursor)/sizeof(char), self);
}
// /* Extract filters */
// }
} }
void init_liquid_variable() void init_liquid_variable()
{ {
cLiquidVariable = rb_define_class_under(mLiquid, "Variable", rb_cObject); cLiquidVariable = rb_define_class_under(mLiquid, "Variable", rb_cObject);
rb_define_alloc_func(cLiquidVariable, rb_variable_allocate); rb_define_alloc_func(cLiquidVariable, rb_variable_allocate);
rb_define_method(cLiquidVariable, "lax_parse", rb_variable_lax_parse_new, 1); rb_define_method(cLiquidVariable, "lax_parse", rb_variable_lax_parse, 1);
} }
test/liquid/variable_test.rb
+1 -1
View File
@@ -11,7 +11,7 @@ class VariableTest < Test::Unit::TestCase
def test_filters def test_filters
var = Variable.new('hello | textileze') var = Variable.new('hello | textileze')
assert_equal 'hello', var.name assert_equal 'hello', var.name
# assert_equal [["textileze",[]]], var.filters assert_equal [["textileze",[]]], var.filters
var = Variable.new('hello | textileze | paragraph') var = Variable.new('hello | textileze | paragraph')
assert_equal 'hello', var.name assert_equal 'hello', var.name