diff options
author | Daniel Kolesa <d.kolesa@osg.samsung.com> | 2015-05-07 17:35:33 +0100 |
---|---|---|
committer | Daniel Kolesa <d.kolesa@osg.samsung.com> | 2015-05-07 17:35:33 +0100 |
commit | b5a7a9b556e3966cccbdeece396ea48f0b4d84e9 (patch) | |
tree | 8bc09b83e5f309946d784fb389b34153f114d121 | |
parent | ed0988a22d9439934a5213f4fa96cb7db76c71e3 (diff) |
eolian: remove old property syntax support
-rw-r--r-- | src/lib/eolian/eo_lexer.h | 4 | ||||
-rw-r--r-- | src/lib/eolian/eo_parser.c | 17 |
2 files changed, 2 insertions, 19 deletions
diff --git a/src/lib/eolian/eo_lexer.h b/src/lib/eolian/eo_lexer.h index 3aee446ea1..83638da27b 100644 --- a/src/lib/eolian/eo_lexer.h +++ b/src/lib/eolian/eo_lexer.h | |||
@@ -28,8 +28,8 @@ enum Tokens | |||
28 | KW(destructor), KW(eo), KW(eo_prefix), KW(events), KW(free), \ | 28 | KW(destructor), KW(eo), KW(eo_prefix), KW(events), KW(free), \ |
29 | KW(get), KW(implements), KW(interface), KW(keys), KW(legacy), \ | 29 | KW(get), KW(implements), KW(interface), KW(keys), KW(legacy), \ |
30 | KW(legacy_prefix), KW(methods), KW(mixin), KW(own), KW(params), \ | 30 | KW(legacy_prefix), KW(methods), KW(mixin), KW(own), KW(params), \ |
31 | KW(properties), KW(set), KW(type), KW(values), KW(var), KWAT(auto), \ | 31 | KW(set), KW(type), KW(values), KW(var), KWAT(auto), KWAT(beta), \ |
32 | KWAT(beta), KWAT(c_only), KWAT(class), KWAT(const), KWAT(const_get), \ | 32 | KWAT(c_only), KWAT(class), KWAT(const), KWAT(const_get), \ |
33 | KWAT(const_set), KWAT(empty), KWAT(extern), KWAT(free), KWAT(in), \ | 33 | KWAT(const_set), KWAT(empty), KWAT(extern), KWAT(free), KWAT(in), \ |
34 | KWAT(inout), KWAT(nonull), KWAT(nullable), KWAT(optional), KWAT(out), \ | 34 | KWAT(inout), KWAT(nonull), KWAT(nullable), KWAT(optional), KWAT(out), \ |
35 | KWAT(private), KWAT(property), KWAT(protected), KWAT(virtual), \ | 35 | KWAT(private), KWAT(property), KWAT(protected), KWAT(virtual), \ |
diff --git a/src/lib/eolian/eo_parser.c b/src/lib/eolian/eo_parser.c index 9ed3deb99d..4a19c00a37 100644 --- a/src/lib/eolian/eo_parser.c +++ b/src/lib/eolian/eo_parser.c | |||
@@ -1643,18 +1643,6 @@ parse_methods(Eo_Lexer *ls) | |||
1643 | } | 1643 | } |
1644 | 1644 | ||
1645 | static void | 1645 | static void |
1646 | parse_properties(Eo_Lexer *ls) | ||
1647 | { | ||
1648 | int line, col; | ||
1649 | eo_lexer_get(ls); | ||
1650 | line = ls->line_number, col = ls->column; | ||
1651 | check_next(ls, '{'); | ||
1652 | while (ls->t.token != '}') | ||
1653 | parse_property(ls); | ||
1654 | check_match(ls, '}', '{', line, col); | ||
1655 | } | ||
1656 | |||
1657 | static void | ||
1658 | parse_implements(Eo_Lexer *ls, Eina_Bool iface) | 1646 | parse_implements(Eo_Lexer *ls, Eina_Bool iface) |
1659 | { | 1647 | { |
1660 | int line, col; | 1648 | int line, col; |
@@ -1698,7 +1686,6 @@ parse_class_body(Eo_Lexer *ls, Eolian_Class_Type type) | |||
1698 | Eina_Bool has_legacy_prefix = EINA_FALSE, | 1686 | Eina_Bool has_legacy_prefix = EINA_FALSE, |
1699 | has_eo_prefix = EINA_FALSE, | 1687 | has_eo_prefix = EINA_FALSE, |
1700 | has_data = EINA_FALSE, | 1688 | has_data = EINA_FALSE, |
1701 | has_properties = EINA_FALSE, | ||
1702 | has_methods = EINA_FALSE, | 1689 | has_methods = EINA_FALSE, |
1703 | has_implements = EINA_FALSE, | 1690 | has_implements = EINA_FALSE, |
1704 | has_constructors = EINA_FALSE, | 1691 | has_constructors = EINA_FALSE, |
@@ -1742,10 +1729,6 @@ parse_class_body(Eo_Lexer *ls, Eolian_Class_Type type) | |||
1742 | eo_lexer_get(ls); | 1729 | eo_lexer_get(ls); |
1743 | check_next(ls, ';'); | 1730 | check_next(ls, ';'); |
1744 | break; | 1731 | break; |
1745 | case KW_properties: | ||
1746 | CASE_LOCK(ls, properties, "properties definition") | ||
1747 | parse_properties(ls); | ||
1748 | break; | ||
1749 | case KW_methods: | 1732 | case KW_methods: |
1750 | CASE_LOCK(ls, methods, "methods definition") | 1733 | CASE_LOCK(ls, methods, "methods definition") |
1751 | parse_methods(ls); | 1734 | parse_methods(ls); |