eolian: @own -> own

diff --git a/src/lib/eolian/eo_lexer.h b/src/lib/eolian/eo_lexer.h
index 3c08485..c5e0f0b 100644 (file)
--- a/src/lib/eolian/eo_lexer.h
+++ b/src/lib/eolian/eo_lexer.h
@@ -20,8 +20,8 @@ enum Tokens
     KW(abstract), KW(constructor), KW(constructors), KW(data), \
     KW(destructor), KW(eo_prefix), KW(events), KW(func), KW(get), \
     KW(implements), KW(interface), KW(keys), KW(legacy), KW(legacy_prefix), \
-    KW(methods), KW(mixin), KW(params), KW(properties), KW(set), KW(type), \
-    KW(values), KWAT(in), KWAT(inout), KWAT(nonull), KWAT(out), KWAT(own), \
+    KW(methods), KW(mixin), KW(own), KW(params), KW(properties), KW(set), \
+    KW(type), KW(values), KWAT(in), KWAT(inout), KWAT(nonull), KWAT(out), \
     KWAT(warn_unused), \
     \
     KW(char), KW(uchar), KW(schar), KW(short), KW(ushort), KW(int), KW(uint), \

diff --git a/src/lib/eolian/eo_parser.c b/src/lib/eolian/eo_parser.c
index 950e29e..2d98a4b 100644 (file)
--- a/src/lib/eolian/eo_parser.c
+++ b/src/lib/eolian/eo_parser.c
@@ -166,7 +166,7 @@ parse_type(Eo_Lexer *ls)
              check_match(ls, ')', '(', line);
              goto parse_ptr;
           }
-        case KW_at_own:
+        case KW_own:
           {
              int line;
              eo_lexer_get(ls);
@@ -336,8 +336,8 @@ parse_attrs(Eo_Lexer *ls)
                 first = EINA_FALSE;
                 eo_lexer_get(ls);
                 break;
-             case KW_at_own:
-                CASE_LOCK(ls, own, "@own qualifier")
+             case KW_own:
+                CASE_LOCK(ls, own, "own qualifier")
                 if (!first) eina_strbuf_append_char(buf, ' ');
                 eina_strbuf_append(buf, "@own");
                 first = EINA_FALSE;

diff --git a/src/tests/eolian/data/complex_type.eo b/src/tests/eolian/data/complex_type.eo
index a64f6d2..5b7abcf 100644 (file)
--- a/src/tests/eolian/data/complex_type.eo
+++ b/src/tests/eolian/data/complex_type.eo
@@ -2,21 +2,21 @@ class Complex_Type {
    properties {
       a {
          set {
-            return  @own(Eina_List*)<Eina_Array*<@own(Eo**)>>;
+            return  own(Eina_List*)<Eina_Array*<own(Eo**)>>;
          }
          get {
          }
          values {
-            @own(Eina_List*)<int> value;
+            own(Eina_List*)<int> value;
          }
       }
    }
    methods {
       foo {
          params {
-            @own(char*) buf;
+            own(char*) buf;
          }
-         return @own(Eina_List*)<Eina_Stringshare *>; /*@ comment for method return */
+         return own(Eina_List*)<Eina_Stringshare *>; /*@ comment for method return */
       }
    }
 }

diff --git a/src/tests/eolian/data/object_impl.eo b/src/tests/eolian/data/object_impl.eo
index 5a5598d..8ce38de 100644 (file)
--- a/src/tests/eolian/data/object_impl.eo
+++ b/src/tests/eolian/data/object_impl.eo
@@ -21,7 +21,7 @@ class Object (Base) {
             const(char)* part;
          }
          values {
-            @own(Eina_List*)<int> value;
+            own(Eina_List*)<int> value;
          }
       }
       b {
@@ -31,7 +31,7 @@ class Object (Base) {
             /* set as virtual pure - no implementation expected */
          }
          values {
-            @own(Eina_List*)<int> value;
+            own(Eina_List*)<int> value;
          }
       }
    }

diff --git a/src/tests/eolian/data/object_impl_add.eo b/src/tests/eolian/data/object_impl_add.eo
index 5b4bad7..0965c58 100644 (file)
--- a/src/tests/eolian/data/object_impl_add.eo
+++ b/src/tests/eolian/data/object_impl_add.eo
@@ -7,7 +7,7 @@ class Object (Base) {
             /* set as virtual pure - no implementation expected */
          }
          values {
-            @own(Eina_List*)<int> value;
+            own(Eina_List*)<int> value;
          }
       }
    }

diff --git a/src/tests/eolian/data/typedef.eo b/src/tests/eolian/data/typedef.eo
index 4ee614e..fba17f0 100644 (file)
--- a/src/tests/eolian/data/typedef.eo
+++ b/src/tests/eolian/data/typedef.eo
@@ -1,5 +1,5 @@
 type Evas_Coord: int; /* Simple type definition */
-type List_Objects: @own(Eina_List*)< Eo *>; /* A little more complex */
+type List_Objects: own(Eina_List*)< Eo *>; /* A little more complex */
 
 class Dummy {
    methods {
@@ -7,7 +7,7 @@ class Dummy {
          params {
             int idx;
          }
-         return @own(char*); /*@ comment for method return */
+         return own(char*); /*@ comment for method return */
       }
    }
 }