habaki 0.5.4 → 0.5.7
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/ext/katana/rb_katana.c +1 -1
- data/ext/katana/rb_katana_declaration.c +2 -3
- data/ext/katana/rb_katana_rule.c +2 -2
- data/ext/katana/rb_katana_selector.c +4 -7
- data/ext/katana/src/katana.tab.c +9 -11
- data/ext/katana/src/parser.c +1 -0
- data/ext/katana/src/tokenizer.c +1 -0
- data/lib/habaki/declarations.rb +2 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 0fd0e2139182ac5010a3b35babbcae6c6d72f44ed202073409f18fb176697f6b
|
4
|
+
data.tar.gz: 8f4c8f57cc5e63a989485a82523c424902179b4717d3df89fd86934afda4ae6f
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 5432b604be85936b38b166b240b29c1779ffd6ae4ebd3a29376df4b543bca6b66bc9dfa98b0afeb1ceabeed64c612538bf4db23ceb4bf6dbf9046727d3a5574b
|
7
|
+
data.tar.gz: 7e6487154a87046b8ce1c9cd2e38f7da4dcc909faf8e1930e0264bb1c7606f9de10baefde686ca347061ed2798ad5177bb741cb262d7098b2d56071a913ea62c
|
data/ext/katana/rb_katana.c
CHANGED
@@ -281,8 +281,7 @@ VALUE rb_value_value(VALUE self)
|
|
281
281
|
case KATANA_VALUE_VH:
|
282
282
|
case KATANA_VALUE_VMIN:
|
283
283
|
case KATANA_VALUE_VMAX:
|
284
|
-
|
285
|
-
// val = rb_str_new2(c_val->raw);
|
284
|
+
case KATANA_VALUE_FR:
|
286
285
|
val = rb_float_new(c_val->fValue);
|
287
286
|
break;
|
288
287
|
case KATANA_VALUE_IDENT:
|
@@ -336,7 +335,7 @@ VALUE rb_value_function_name(VALUE self)
|
|
336
335
|
KatanaValueFunction *c_val;
|
337
336
|
Data_Get_Struct(self, KatanaValueFunction, c_val);
|
338
337
|
if (c_val->name)
|
339
|
-
return
|
338
|
+
return UTF8_STR_NEW(c_val->name);
|
340
339
|
else
|
341
340
|
return Qnil;
|
342
341
|
}
|
data/ext/katana/rb_katana_rule.c
CHANGED
@@ -104,7 +104,7 @@ VALUE rb_namespace_rule_prefix(VALUE self)
|
|
104
104
|
KatanaNamespaceRule *c_rule;
|
105
105
|
Data_Get_Struct(self, KatanaNamespaceRule, c_rule);
|
106
106
|
if (c_rule->prefix)
|
107
|
-
return
|
107
|
+
return UTF8_STR_NEW(c_rule->prefix);
|
108
108
|
else
|
109
109
|
return Qnil;
|
110
110
|
}
|
@@ -117,7 +117,7 @@ VALUE rb_namespace_rule_uri(VALUE self)
|
|
117
117
|
KatanaNamespaceRule *c_rule;
|
118
118
|
Data_Get_Struct(self, KatanaNamespaceRule, c_rule);
|
119
119
|
if (c_rule->prefix)
|
120
|
-
return
|
120
|
+
return UTF8_STR_NEW(c_rule->uri);
|
121
121
|
else
|
122
122
|
return Qnil;
|
123
123
|
}
|
@@ -13,7 +13,7 @@ VALUE rb_name_local(VALUE self)
|
|
13
13
|
KatanaQualifiedName *c_name;
|
14
14
|
Data_Get_Struct(self, KatanaQualifiedName, c_name);
|
15
15
|
if (c_name->local)
|
16
|
-
return
|
16
|
+
return UTF8_STR_NEW(c_name->local);
|
17
17
|
else
|
18
18
|
return Qnil;
|
19
19
|
}
|
@@ -26,7 +26,7 @@ VALUE rb_name_prefix(VALUE self)
|
|
26
26
|
KatanaQualifiedName *c_name;
|
27
27
|
Data_Get_Struct(self, KatanaQualifiedName, c_name);
|
28
28
|
if (c_name->prefix)
|
29
|
-
return
|
29
|
+
return UTF8_STR_NEW(c_name->prefix);
|
30
30
|
else
|
31
31
|
return Qnil;
|
32
32
|
}
|
@@ -39,7 +39,7 @@ VALUE rb_name_uri(VALUE self)
|
|
39
39
|
KatanaQualifiedName *c_name;
|
40
40
|
Data_Get_Struct(self, KatanaQualifiedName, c_name);
|
41
41
|
if (c_name->uri)
|
42
|
-
return
|
42
|
+
return UTF8_STR_NEW(c_name->uri);
|
43
43
|
else
|
44
44
|
return Qnil;
|
45
45
|
}
|
@@ -475,10 +475,7 @@ VALUE rb_selector_data_value(VALUE self)
|
|
475
475
|
KatanaSelectorRareData *c_sel;
|
476
476
|
Data_Get_Struct(self, KatanaSelectorRareData, c_sel);
|
477
477
|
if (c_sel->value)
|
478
|
-
{
|
479
|
-
// force UTF-8
|
480
478
|
return UTF8_STR_NEW(c_sel->value);
|
481
|
-
}
|
482
479
|
else
|
483
480
|
return Qnil;
|
484
481
|
}
|
@@ -504,7 +501,7 @@ VALUE rb_selector_data_argument(VALUE self)
|
|
504
501
|
KatanaSelectorRareData *c_sel;
|
505
502
|
Data_Get_Struct(self, KatanaSelectorRareData, c_sel);
|
506
503
|
if (c_sel->argument)
|
507
|
-
return
|
504
|
+
return UTF8_STR_NEW(c_sel->argument);
|
508
505
|
else
|
509
506
|
return Qnil;
|
510
507
|
}
|
data/ext/katana/src/katana.tab.c
CHANGED
@@ -742,14 +742,14 @@ static const yytype_int16 yyrline[] =
|
|
742
742
|
1548, 1549, 1555, 1556, 1558, 1559, 1560, 1561, 1562, 1563,
|
743
743
|
1569, 1570, 1571, 1575, 1579, 1580, 1581, 1582, 1583, 1584,
|
744
744
|
1585, 1586, 1587, 1588, 1589, 1590, 1591, 1592, 1593, 1594,
|
745
|
-
1595, 1596, 1597, 1598, 1599,
|
746
|
-
|
747
|
-
|
748
|
-
|
749
|
-
|
750
|
-
|
751
|
-
|
752
|
-
|
745
|
+
1595, 1596, 1597, 1598, 1599, 1600, 1601, 1602, 1603, 1604,
|
746
|
+
1605, 1606, 1607, 1608, 1612, 1615, 1618, 1624, 1625, 1629,
|
747
|
+
1632, 1635, 1638, 1643, 1645, 1649, 1655, 1661, 1665, 1670,
|
748
|
+
1675, 1679, 1682, 1689, 1690, 1694, 1698, 1704, 1705, 1709,
|
749
|
+
1710, 1711, 1712, 1713, 1717, 1720, 1721, 1722, 1729, 1732,
|
750
|
+
1733, 1734, 1738, 1741, 1742, 1746, 1752, 1758, 1762, 1765,
|
751
|
+
1765, 1765, 1765, 1765, 1765, 1765, 1765, 1768, 1773, 1778,
|
752
|
+
1780, 1781, 1782, 1783, 1786, 1788, 1789, 1790
|
753
753
|
};
|
754
754
|
#endif
|
755
755
|
|
@@ -3982,9 +3982,7 @@ yyreduce:
|
|
3982
3982
|
break;
|
3983
3983
|
|
3984
3984
|
case 304:
|
3985
|
-
{
|
3986
|
-
(yyval.value) = katana_new_dimension_value(parser, &(yyvsp[0].number), KATANA_VALUE_REMS);
|
3987
|
-
}
|
3985
|
+
{ (yyval.value) = katana_new_dimension_value(parser, &(yyvsp[0].number), KATANA_VALUE_REMS); }
|
3988
3986
|
break;
|
3989
3987
|
|
3990
3988
|
case 305:
|
data/ext/katana/src/parser.c
CHANGED
@@ -1516,6 +1516,7 @@ static const char* katana_stringify_value(KatanaParser* parser, KatanaValue* val
|
|
1516
1516
|
case KATANA_VALUE_VH:
|
1517
1517
|
case KATANA_VALUE_VMIN:
|
1518
1518
|
case KATANA_VALUE_VMAX:
|
1519
|
+
case KATANA_VALUE_FR:
|
1519
1520
|
snprintf(str, sizeof(str), "%s", value->raw);
|
1520
1521
|
break;
|
1521
1522
|
case KATANA_VALUE_IDENT:
|
data/ext/katana/src/tokenizer.c
CHANGED
data/lib/habaki/declarations.rb
CHANGED
@@ -46,7 +46,8 @@ module Habaki
|
|
46
46
|
when 4
|
47
47
|
values = declaration.values
|
48
48
|
else
|
49
|
-
|
49
|
+
# "Habaki error: Cannot parse #{property}: #{declaration.values} (#{declaration.values.length} values)"
|
50
|
+
next
|
50
51
|
end
|
51
52
|
|
52
53
|
replacement = [top, right, bottom, left].zip(values).to_h
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: habaki
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.5.
|
4
|
+
version: 0.5.7
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Julien Boulnois
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2022-
|
11
|
+
date: 2022-07-07 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: nokogiri
|