eolian: rename ref to ptr to avoid confusion with eo refs

diff --git a/src/lib/eo/efl_object.eo b/src/lib/eo/efl_object.eo
index 703c53f..3192061 100644 (file)
--- a/src/lib/eo/efl_object.eo
+++ b/src/lib/eo/efl_object.eo
@@ -11,7 +11,7 @@ struct Efl.Event.Description {
 struct Efl.Event {
      [[Parameter passed in event callbacks holding extra event parameters]]
      object: Efl.Object; [[The object the event was called on.]]
-     desc: ref(const(Efl.Event.Description)); [[The event description.]]
+     desc: ptr(const(Efl.Event.Description)); [[The event description.]]
      info: void_ptr; [[Extra event information passed by the event caller.]]
 }
 
@@ -23,7 +23,7 @@ struct Efl.Callback_Array_Item {
 
       See also \@ref efl_event_callback_array_add.
     ]]
-    desc: ref(const(Efl.Event.Description)); [[The event description.]]
+    desc: ptr(const(Efl.Event.Description)); [[The event description.]]
     func: Efl.Event_Cb; [[The callback function.]]
 }
 
@@ -199,13 +199,13 @@ abstract Efl.Object ()
            being freed.
          ]]
          params {
-            @in wref: ref(Efl.Object);
+            @in wref: ptr(Efl.Object);
          }
       }
       wref_del {
          [[Delete the weak reference passed.]]
          params {
-            @in wref: ref(Efl.Object);
+            @in wref: ptr(Efl.Object);
          }
       }
       @property key_data {
@@ -289,7 +289,7 @@ abstract Efl.Object ()
             key: string; [[the key associated with the value]]
          }
          values {
-            value: ref(generic_value); [[the value to set]]
+            value: ptr(generic_value); [[the value to set]]
          }
       }
       event_thaw {
@@ -324,7 +324,7 @@ abstract Efl.Object ()
          ]]
          return: bool; [[Return $true when the callback has been successfully added.]]
          params {
-            @in desc: ref(const(Efl.Event.Description)); [[The description of the event to listen to]]
+            @in desc: ptr(const(Efl.Event.Description)); [[The description of the event to listen to]]
             @in priority: Efl.Callback_Priority; [[The priority of the callback]]
             @in cb: Efl.Event_Cb; [[the callback to call]]
             @in data: const(void_ptr); [[additional data to pass to the callback]]
@@ -334,7 +334,7 @@ abstract Efl.Object ()
          [[Del a callback with a specific data associated to it for an event.]]
          return: bool; [[Return $true when the callback has been successfully removed.]]
          params {
-            @in desc: ref(const(Efl.Event.Description)); [[The description of the event to listen to]]
+            @in desc: ptr(const(Efl.Event.Description)); [[The description of the event to listen to]]
             @in func: Efl.Event_Cb; [[the callback to delete]]
             @in user_data: const(void_ptr); [[The data to compare]]
          }
@@ -349,7 +349,7 @@ abstract Efl.Object ()
          ]]
          return: bool; [[Return $true when the callback has been successfully added.]]
          params {
-            @in array: ref(const(Efl.Callback_Array_Item)); [[an #Efl_Callback_Array_Item of events to listen to]]
+            @in array: ptr(const(Efl.Callback_Array_Item)); [[an #Efl_Callback_Array_Item of events to listen to]]
             @in priority: Efl.Callback_Priority; [[The priority of the callback]]
             @in data: const(void_ptr); [[additional data to pass to the callback]]
          }
@@ -360,14 +360,14 @@ abstract Efl.Object ()
          ]]
          return: bool; [[Return $true when the callback has been successfully removed.]]
          params {
-            @in array: ref(const(Efl.Callback_Array_Item)); [[an #Efl_Callback_Array_Item of events to listen to]]
+            @in array: ptr(const(Efl.Callback_Array_Item)); [[an #Efl_Callback_Array_Item of events to listen to]]
             @in user_data: const(void_ptr); [[The data to compare]]
          }
       }
       event_callback_call {
          [[Call the callbacks for an event of an object.]]
          params {
-            @in desc: ref(const(Efl.Event.Description)); [[The description of the event to call]]
+            @in desc: ptr(const(Efl.Event.Description)); [[The description of the event to call]]
             @in event_info: void_ptr; [[Extra event info to pass to the callbacks]]
          }
          return: bool; [[$false if one of the callbacks aborted the call,
@@ -383,7 +383,7 @@ abstract Efl.Object ()
            @since 1.19
          ]]
          params {
-            @in desc: ref(const(Efl.Event.Description)); [[The description of the event to call]]
+            @in desc: ptr(const(Efl.Event.Description)); [[The description of the event to call]]
             @in event_info: void_ptr; [[Extra event info to pass to the callbacks]]
          }
          return: bool; [[$false if one of the callbacks aborted the call,
@@ -402,21 +402,21 @@ abstract Efl.Object ()
       event_callback_forwarder_add {
          [[Add an event callback forwarder for an event and an object.]]
          params {
-            @in desc: ref(const(Efl.Event.Description)); [[The description of the event to listen to]]
+            @in desc: ptr(const(Efl.Event.Description)); [[The description of the event to listen to]]
             @in new_obj: Efl.Object; [[The object to emit events from]]
          }
       }
       event_callback_forwarder_del {
          [[Remove an event callback forwarder for an event and an object.]]
          params {
-            @in desc: ref(const(Efl.Event.Description)); [[The description of the event to listen to]]
+            @in desc: ptr(const(Efl.Event.Description)); [[The description of the event to listen to]]
             @in new_obj: Efl.Object; [[The object to emit events from]]
          }
       }
       dbg_info_get {
          [[Get dbg information from the object.]]
          params {
-            @in root_node: ref(Efl.Dbg_Info); [[node of the tree]]
+            @in root_node: ptr(Efl.Dbg_Info); [[node of the tree]]
          }
       }
       children_iterator_new {

diff --git a/src/lib/eolian/eo_lexer.h b/src/lib/eolian/eo_lexer.h
index beaeca6..eeb6f7d 100644 (file)
--- a/src/lib/eolian/eo_lexer.h
+++ b/src/lib/eolian/eo_lexer.h
@@ -27,7 +27,7 @@ enum Tokens
     KW(abstract), KW(constructor), KW(constructors), KW(data), \
     KW(destructor), KW(eo), KW(eo_prefix), KW(event_prefix), KW(events), KW(free), \
     KW(get), KW(implements), KW(import), KW(interface), KW(keys), KW(legacy), \
-    KW(legacy_prefix), KW(methods), KW(mixin), KW(own), KW(params), KW(ref), \
+    KW(legacy_prefix), KW(methods), KW(mixin), KW(own), KW(params), KW(ptr), \
     KW(set), KW(type), KW(values), KW(var), KWAT(auto), KWAT(beta), \
     KWAT(c_only), KWAT(class), KWAT(const), KWAT(empty), KWAT(extern), \
     KWAT(free), KWAT(hot), KWAT(in), KWAT(inout), KWAT(nonull), KWAT(nullable), \

diff --git a/src/lib/eolian/eo_parser.c b/src/lib/eolian/eo_parser.c
index 1bc0f09..106fd20 100644 (file)
--- a/src/lib/eolian/eo_parser.c
+++ b/src/lib/eolian/eo_parser.c
@@ -757,7 +757,7 @@ parse_type_void(Eo_Lexer *ls, Eina_Bool allow_ref, Eina_Bool allow_sarray)
            check_match(ls, ')', '(', pline, pcol);
            goto parse_ptr;
         }
-      case KW_ref:
+      case KW_ptr:
         {
            int pline, pcol;
            eo_lexer_get(ls);

diff --git a/src/tests/eolian/data/class_simple.eo b/src/tests/eolian/data/class_simple.eo
index 95b315e..1cb75c9 100644 (file)
--- a/src/tests/eolian/data/class_simple.eo
+++ b/src/tests/eolian/data/class_simple.eo
@@ -35,7 +35,7 @@ class Class_Simple {
             @in a: int; [[a]]
             @inout b: char;
             @out c: double (1337.6);
-            @in d: ref(int);
+            @in d: ptr(int);
          }
          return: char * (null); [[comment for method return]]
       }
@@ -44,7 +44,7 @@ class Class_Simple {
          params {
             x: int;
          }
-         return: ref(int);
+         return: ptr(int);
       }
    }
 }

diff --git a/src/tests/eolian/data/struct.eo b/src/tests/eolian/data/struct.eo
index 81429b9..c701d26 100644 (file)
--- a/src/tests/eolian/data/struct.eo
+++ b/src/tests/eolian/data/struct.eo
@@ -1,5 +1,5 @@
 struct Named {
-    field: ref(int);
+    field: ptr(int);
     something: string;
     arr: static_array<int, 16>;
     tarr: terminated_array<string>;

diff --git a/src/tests/eolian_cxx/name1_name2_type_generation.eo b/src/tests/eolian_cxx/name1_name2_type_generation.eo
index ad26ed1..7da1c88 100644 (file)
--- a/src/tests/eolian_cxx/name1_name2_type_generation.eo
+++ b/src/tests/eolian_cxx/name1_name2_type_generation.eo
@@ -5,17 +5,17 @@ class Name1.Name2.Type_Generation (Efl.Object)
      // inref
      inrefint {
        params {
-         @in v: ref(int);
+         @in v: ptr(int);
        }
      }
      inrefintown {
        params {
-         @in v: own(ref(int));
+         @in v: own(ptr(int));
        }
      }
      inrefintownfree {
        params {
-         @in v: free(own(ref(int)), free);
+         @in v: free(own(ptr(int)), free);
        }
      }
      // in void ptr
@@ -31,17 +31,17 @@ class Name1.Name2.Type_Generation (Efl.Object)
      }
      inintptr {
        params {
-         @in v: ref(int);
+         @in v: ptr(int);
        }
      }
      inintptrown {
        params {
-         @in v: own(ref(int));
+         @in v: own(ptr(int));
        }
      }
      inintptrownfree {
        params {
-         @in v: free(own(ref(int)), free);
+         @in v: free(own(ptr(int)), free);
        }
      }
      instring {
@@ -51,7 +51,7 @@ class Name1.Name2.Type_Generation (Efl.Object)
      }
      instringptr {
        params {
-         @in v: ref(string);
+         @in v: ptr(string);
        }
      }
      instringown {
@@ -61,7 +61,7 @@ class Name1.Name2.Type_Generation (Efl.Object)
      }
      instringptrown {
        params {
-         @in v: own(ref(string));
+         @in v: own(ptr(string));
        }
      }
      instringshare {
@@ -76,7 +76,7 @@ class Name1.Name2.Type_Generation (Efl.Object)
      }
      // return
      returnrefint {
-       return: ref(int);
+       return: ptr(int);
      }
      returnvoidptr {
         return: void_ptr;
@@ -85,27 +85,27 @@ class Name1.Name2.Type_Generation (Efl.Object)
        return: int;
      }
      returnintptr {
-       return: ref(int);
+       return: ptr(int);
      }
      returnintptrown {
-       return: own(ref(int));
+       return: own(ptr(int));
      }
      returnintptrownfree {
        params {
-         @in v: free(own(ref(int)), free);
+         @in v: free(own(ptr(int)), free);
        }
      }
      returnstring {
        return: string;
      }
      returnstringptr {
-       return: ref(string);
+       return: ptr(string);
      }
      returnstringown {
        return: own(string);
      }
      returnstringownptr {
-       return: own(ref(string));
+       return: own(ptr(string));
      }
      returnstringshare {
         return: stringshare;
@@ -126,17 +126,17 @@ class Name1.Name2.Type_Generation (Efl.Object)
      }
      outintptr {
        params {
-         @out v: ref(int);
+         @out v: ptr(int);
        }
      }
      outintptrown {
        params {
-         @out v: own(ref(int));
+         @out v: own(ptr(int));
        }
      }
      outintptrownfree {
        params {
-         @out v: free(own(ref(int)), free);
+         @out v: free(own(ptr(int)), free);
        }
      }
      outstringshare {
@@ -177,17 +177,17 @@ class Name1.Name2.Type_Generation (Efl.Object)
      }
      optionalinintptr {
        params {
-         @in v: ref(int) @optional;
+         @in v: ptr(int) @optional;
        }
      }
      optionalinintptrown {
        params {
-         @in v: own(ref(int)) @optional;
+         @in v: own(ptr(int)) @optional;
        }
      }
      optionalinintptrownfree {
        params {
-         @in v: free(own(ref(int)), free) @optional;
+         @in v: free(own(ptr(int)), free) @optional;
        }
      }
      optionaloutvoidptr {
@@ -202,17 +202,17 @@ class Name1.Name2.Type_Generation (Efl.Object)
      }
      optionaloutintptr {
        params {
-         @out v: ref(int) @optional;
+         @out v: ptr(int) @optional;
        }
      }
      optionaloutintptrown {
        params {
-         @out v: own(ref(int)) @optional;
+         @out v: own(ptr(int)) @optional;
        }
      }
      optionaloutintptrownfree {
        params {
-         @out v: free(own(ref(int)), free) @optional;
+         @out v: free(own(ptr(int)), free) @optional;
        }
      }
      optionalinclassname {