From b5a7a9b556e3966cccbdeece396ea48f0b4d84e9 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 7 May 2015 17:35:33 +0100 Subject: [PATCH] eolian: remove old property syntax support --- src/lib/eolian/eo_lexer.h | 4 ++-- 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 KW(destructor), KW(eo), KW(eo_prefix), KW(events), KW(free), \ KW(get), KW(implements), KW(interface), KW(keys), KW(legacy), \ KW(legacy_prefix), KW(methods), KW(mixin), KW(own), KW(params), \ - KW(properties), KW(set), KW(type), KW(values), KW(var), KWAT(auto), \ - KWAT(beta), KWAT(c_only), KWAT(class), KWAT(const), KWAT(const_get), \ + KW(set), KW(type), KW(values), KW(var), KWAT(auto), KWAT(beta), \ + KWAT(c_only), KWAT(class), KWAT(const), KWAT(const_get), \ KWAT(const_set), KWAT(empty), KWAT(extern), KWAT(free), KWAT(in), \ KWAT(inout), KWAT(nonull), KWAT(nullable), KWAT(optional), KWAT(out), \ 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 @@ -1642,18 +1642,6 @@ parse_methods(Eo_Lexer *ls) check_match(ls, '}', '{', line, col); } -static void -parse_properties(Eo_Lexer *ls) -{ - int line, col; - eo_lexer_get(ls); - line = ls->line_number, col = ls->column; - check_next(ls, '{'); - while (ls->t.token != '}') - parse_property(ls); - check_match(ls, '}', '{', line, col); -} - static void parse_implements(Eo_Lexer *ls, Eina_Bool iface) { @@ -1698,7 +1686,6 @@ parse_class_body(Eo_Lexer *ls, Eolian_Class_Type type) Eina_Bool has_legacy_prefix = EINA_FALSE, has_eo_prefix = EINA_FALSE, has_data = EINA_FALSE, - has_properties = EINA_FALSE, has_methods = EINA_FALSE, has_implements = EINA_FALSE, has_constructors = EINA_FALSE, @@ -1742,10 +1729,6 @@ parse_class_body(Eo_Lexer *ls, Eolian_Class_Type type) eo_lexer_get(ls); check_next(ls, ';'); break; - case KW_properties: - CASE_LOCK(ls, properties, "properties definition") - parse_properties(ls); - break; case KW_methods: CASE_LOCK(ls, methods, "methods definition") parse_methods(ls);