]> git.ipfire.org Git - thirdparty/vala.git/commitdiff
parser: Support one-line declaration of multiple fields in classes/structs
authorwszqkzqk <wszqkzqk@qq.com>
Wed, 4 Jan 2023 11:42:17 +0000 (19:42 +0800)
committerRico Tzschichholz <ricotz@ubuntu.com>
Thu, 5 Jan 2023 11:56:47 +0000 (12:56 +0100)
Fixes https://gitlab.gnome.org/GNOME/vala/issues/6

tests/Makefile.am
tests/parser/field-multi-one-line.c-expected [new file with mode: 0644]
tests/parser/field-multi-one-line.vala [new file with mode: 0644]
vala/valaparser.vala

index 20a6fe7809cd6c0c380f6eb239fa8386273dc221..8bdfc3a77bfed2743a7837631c5b688c66dd33c1 100644 (file)
@@ -958,6 +958,7 @@ TESTS = \
        parser/do-statement.vala \
        parser/expect-endbrace.test \
        parser/expect-error.test \
+       parser/field-multi-one-line.vala \
        parser/field-no-abstract.test \
        parser/field-no-override.test \
        parser/field-no-static-class.test \
diff --git a/tests/parser/field-multi-one-line.c-expected b/tests/parser/field-multi-one-line.c-expected
new file mode 100644 (file)
index 0000000..a13e550
--- /dev/null
@@ -0,0 +1,348 @@
+/* parser_field_multi_one_line.c generated by valac, the Vala compiler
+ * generated from parser_field_multi_one_line.vala, do not modify */
+
+#include <glib-object.h>
+#include <glib.h>
+#include <string.h>
+#include <gobject/gvaluecollector.h>
+
+#if !defined(VALA_EXTERN)
+#if defined(_MSC_VER)
+#define VALA_EXTERN __declspec(dllexport) extern
+#elif __GNUC__ >= 4
+#define VALA_EXTERN __attribute__((visibility("default"))) extern
+#else
+#define VALA_EXTERN extern
+#endif
+#endif
+
+#define TYPE_FOO (foo_get_type ())
+typedef struct _Foo Foo;
+
+#define TYPE_BAR (bar_get_type ())
+#define BAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_BAR, Bar))
+#define BAR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_BAR, BarClass))
+#define IS_BAR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_BAR))
+#define IS_BAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_BAR))
+#define BAR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_BAR, BarClass))
+
+typedef struct _Bar Bar;
+typedef struct _BarClass BarClass;
+typedef struct _BarPrivate BarPrivate;
+typedef struct _ParamSpecBar ParamSpecBar;
+
+struct _Foo {
+       gint a;
+       gint b;
+       gint c;
+};
+
+struct _Bar {
+       GTypeInstance parent_instance;
+       volatile int ref_count;
+       BarPrivate * priv;
+       gint a;
+       gint b[2];
+       gint c;
+};
+
+struct _BarClass {
+       GTypeClass parent_class;
+       void (*finalize) (Bar *self);
+};
+
+struct _ParamSpecBar {
+       GParamSpec parent_instance;
+};
+
+static gpointer bar_parent_class = NULL;
+
+VALA_EXTERN GType foo_get_type (void) G_GNUC_CONST ;
+VALA_EXTERN Foo* foo_dup (const Foo* self);
+VALA_EXTERN void foo_free (Foo* self);
+VALA_EXTERN gpointer bar_ref (gpointer instance);
+VALA_EXTERN void bar_unref (gpointer instance);
+VALA_EXTERN GParamSpec* param_spec_bar (const gchar* name,
+                            const gchar* nick,
+                            const gchar* blurb,
+                            GType object_type,
+                            GParamFlags flags);
+VALA_EXTERN void value_set_bar (GValue* value,
+                    gpointer v_object);
+VALA_EXTERN void value_take_bar (GValue* value,
+                     gpointer v_object);
+VALA_EXTERN gpointer value_get_bar (const GValue* value);
+VALA_EXTERN GType bar_get_type (void) G_GNUC_CONST ;
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (Bar, bar_unref)
+VALA_EXTERN Bar* bar_new (void);
+VALA_EXTERN Bar* bar_construct (GType object_type);
+static void bar_finalize (Bar * obj);
+static GType bar_get_type_once (void);
+static void _vala_main (void);
+
+Foo*
+foo_dup (const Foo* self)
+{
+       Foo* dup;
+       dup = g_new0 (Foo, 1);
+       memcpy (dup, self, sizeof (Foo));
+       return dup;
+}
+
+void
+foo_free (Foo* self)
+{
+       g_free (self);
+}
+
+static GType
+foo_get_type_once (void)
+{
+       GType foo_type_id;
+       foo_type_id = g_boxed_type_register_static ("Foo", (GBoxedCopyFunc) foo_dup, (GBoxedFreeFunc) foo_free);
+       return foo_type_id;
+}
+
+GType
+foo_get_type (void)
+{
+       static volatile gsize foo_type_id__once = 0;
+       if (g_once_init_enter (&foo_type_id__once)) {
+               GType foo_type_id;
+               foo_type_id = foo_get_type_once ();
+               g_once_init_leave (&foo_type_id__once, foo_type_id);
+       }
+       return foo_type_id__once;
+}
+
+Bar*
+bar_construct (GType object_type)
+{
+       Bar* self = NULL;
+       self = (Bar*) g_type_create_instance (object_type);
+       return self;
+}
+
+Bar*
+bar_new (void)
+{
+       return bar_construct (TYPE_BAR);
+}
+
+static void
+value_bar_init (GValue* value)
+{
+       value->data[0].v_pointer = NULL;
+}
+
+static void
+value_bar_free_value (GValue* value)
+{
+       if (value->data[0].v_pointer) {
+               bar_unref (value->data[0].v_pointer);
+       }
+}
+
+static void
+value_bar_copy_value (const GValue* src_value,
+                      GValue* dest_value)
+{
+       if (src_value->data[0].v_pointer) {
+               dest_value->data[0].v_pointer = bar_ref (src_value->data[0].v_pointer);
+       } else {
+               dest_value->data[0].v_pointer = NULL;
+       }
+}
+
+static gpointer
+value_bar_peek_pointer (const GValue* value)
+{
+       return value->data[0].v_pointer;
+}
+
+static gchar*
+value_bar_collect_value (GValue* value,
+                         guint n_collect_values,
+                         GTypeCValue* collect_values,
+                         guint collect_flags)
+{
+       if (collect_values[0].v_pointer) {
+               Bar * object;
+               object = collect_values[0].v_pointer;
+               if (object->parent_instance.g_class == NULL) {
+                       return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
+               } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
+                       return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
+               }
+               value->data[0].v_pointer = bar_ref (object);
+       } else {
+               value->data[0].v_pointer = NULL;
+       }
+       return NULL;
+}
+
+static gchar*
+value_bar_lcopy_value (const GValue* value,
+                       guint n_collect_values,
+                       GTypeCValue* collect_values,
+                       guint collect_flags)
+{
+       Bar ** object_p;
+       object_p = collect_values[0].v_pointer;
+       if (!object_p) {
+               return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
+       }
+       if (!value->data[0].v_pointer) {
+               *object_p = NULL;
+       } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
+               *object_p = value->data[0].v_pointer;
+       } else {
+               *object_p = bar_ref (value->data[0].v_pointer);
+       }
+       return NULL;
+}
+
+GParamSpec*
+param_spec_bar (const gchar* name,
+                const gchar* nick,
+                const gchar* blurb,
+                GType object_type,
+                GParamFlags flags)
+{
+       ParamSpecBar* spec;
+       g_return_val_if_fail (g_type_is_a (object_type, TYPE_BAR), NULL);
+       spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
+       G_PARAM_SPEC (spec)->value_type = object_type;
+       return G_PARAM_SPEC (spec);
+}
+
+gpointer
+value_get_bar (const GValue* value)
+{
+       g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BAR), NULL);
+       return value->data[0].v_pointer;
+}
+
+void
+value_set_bar (GValue* value,
+               gpointer v_object)
+{
+       Bar * old;
+       g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BAR));
+       old = value->data[0].v_pointer;
+       if (v_object) {
+               g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_BAR));
+               g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
+               value->data[0].v_pointer = v_object;
+               bar_ref (value->data[0].v_pointer);
+       } else {
+               value->data[0].v_pointer = NULL;
+       }
+       if (old) {
+               bar_unref (old);
+       }
+}
+
+void
+value_take_bar (GValue* value,
+                gpointer v_object)
+{
+       Bar * old;
+       g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BAR));
+       old = value->data[0].v_pointer;
+       if (v_object) {
+               g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_BAR));
+               g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
+               value->data[0].v_pointer = v_object;
+       } else {
+               value->data[0].v_pointer = NULL;
+       }
+       if (old) {
+               bar_unref (old);
+       }
+}
+
+static void
+bar_class_init (BarClass * klass,
+                gpointer klass_data)
+{
+       bar_parent_class = g_type_class_peek_parent (klass);
+       ((BarClass *) klass)->finalize = bar_finalize;
+}
+
+static void
+bar_instance_init (Bar * self,
+                   gpointer klass)
+{
+       gint _tmp0_[2] = {0};
+       _tmp0_[0] = 23;
+       _tmp0_[1] = 42;
+       memcpy (self->b, _tmp0_, 2 * sizeof (gint));
+       self->c = 4711;
+       self->ref_count = 1;
+}
+
+static void
+bar_finalize (Bar * obj)
+{
+       Bar * self;
+       self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BAR, Bar);
+       g_signal_handlers_destroy (self);
+}
+
+static GType
+bar_get_type_once (void)
+{
+       static const GTypeValueTable g_define_type_value_table = { value_bar_init, value_bar_free_value, value_bar_copy_value, value_bar_peek_pointer, "p", value_bar_collect_value, "p", value_bar_lcopy_value };
+       static const GTypeInfo g_define_type_info = { sizeof (BarClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) bar_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (Bar), 0, (GInstanceInitFunc) bar_instance_init, &g_define_type_value_table };
+       static const GTypeFundamentalInfo g_define_type_fundamental_info = { (G_TYPE_FLAG_CLASSED | G_TYPE_FLAG_INSTANTIATABLE | G_TYPE_FLAG_DERIVABLE | G_TYPE_FLAG_DEEP_DERIVABLE) };
+       GType bar_type_id;
+       bar_type_id = g_type_register_fundamental (g_type_fundamental_next (), "Bar", &g_define_type_info, &g_define_type_fundamental_info, 0);
+       return bar_type_id;
+}
+
+GType
+bar_get_type (void)
+{
+       static volatile gsize bar_type_id__once = 0;
+       if (g_once_init_enter (&bar_type_id__once)) {
+               GType bar_type_id;
+               bar_type_id = bar_get_type_once ();
+               g_once_init_leave (&bar_type_id__once, bar_type_id);
+       }
+       return bar_type_id__once;
+}
+
+gpointer
+bar_ref (gpointer instance)
+{
+       Bar * self;
+       self = instance;
+       g_atomic_int_inc (&self->ref_count);
+       return instance;
+}
+
+void
+bar_unref (gpointer instance)
+{
+       Bar * self;
+       self = instance;
+       if (g_atomic_int_dec_and_test (&self->ref_count)) {
+               BAR_GET_CLASS (self)->finalize (self);
+               g_type_free_instance ((GTypeInstance *) self);
+       }
+}
+
+static void
+_vala_main (void)
+{
+}
+
+int
+main (int argc,
+      char ** argv)
+{
+       _vala_main ();
+       return 0;
+}
+
diff --git a/tests/parser/field-multi-one-line.vala b/tests/parser/field-multi-one-line.vala
new file mode 100644 (file)
index 0000000..3f2c73d
--- /dev/null
@@ -0,0 +1,10 @@
+struct Foo {
+       public int a, b, c;
+}
+
+class Bar {
+       public int a, b[2] = { 23, 42 }, c = 4711;
+}
+
+void main () {
+}
index 25769ec54a2dfdd14dec968e68b83ea12e273479..9ac94e4a57b4cd0d7a8f547781c86f6f9a13855d 100644 (file)
@@ -2793,6 +2793,7 @@ public class Vala.Parser : CodeVisitor {
                                                return;
                                        }
                                case TokenType.ASSIGN:
+                               case TokenType.COMMA:
                                case TokenType.SEMICOLON:
                                        rollback (begin);
                                        switch (last_keyword) {
@@ -3143,46 +3144,48 @@ public class Vala.Parser : CodeVisitor {
                var access = parse_access_modifier ((parent is Struct) ? SymbolAccessibility.PUBLIC : SymbolAccessibility.PRIVATE);
                var flags = parse_member_declaration_modifiers ();
                var type = parse_type (true, true);
-               string id = parse_identifier ();
-               type = parse_inline_array_type (type);
+               do {
+                       string id = parse_identifier ();
+                       var ftype = parse_inline_array_type (type.copy ());
 
-               var f = new Field (id, type, null, get_src (begin), comment);
-               f.access = access;
+                       var f = new Field (id, ftype, null, get_src (begin), comment);
+                       f.access = access;
 
-               set_attributes (f, attrs);
-               if (ModifierFlags.STATIC in flags && ModifierFlags.CLASS in flags) {
-                       Report.error (f.source_reference, "only one of `static' or `class' may be specified");
-               } else if (ModifierFlags.STATIC in flags) {
-                       f.binding = MemberBinding.STATIC;
-               } else if (ModifierFlags.CLASS in flags) {
-                       f.binding = MemberBinding.CLASS;
-               } else if (parent is Namespace) {
-                       // default to static member binding in namespace
-                       f.binding = MemberBinding.STATIC;
-               }
+                       set_attributes (f, attrs);
+                       if (ModifierFlags.STATIC in flags && ModifierFlags.CLASS in flags) {
+                               Report.error (f.source_reference, "only one of `static' or `class' may be specified");
+                       } else if (ModifierFlags.STATIC in flags) {
+                               f.binding = MemberBinding.STATIC;
+                       } else if (ModifierFlags.CLASS in flags) {
+                               f.binding = MemberBinding.CLASS;
+                       } else if (parent is Namespace) {
+                               // default to static member binding in namespace
+                               f.binding = MemberBinding.STATIC;
+                       }
 
-               if (!parent.external_package && parent is Struct
-                   && f.access != SymbolAccessibility.PUBLIC && f.binding == MemberBinding.INSTANCE) {
-                       Report.warning (f.source_reference, "accessibility of struct fields can only be `public`");
-               }
+                       if (!parent.external_package && parent is Struct
+                               && f.access != SymbolAccessibility.PUBLIC && f.binding == MemberBinding.INSTANCE) {
+                               Report.warning (f.source_reference, "accessibility of struct fields can only be `public`");
+                       }
 
-               if (ModifierFlags.ABSTRACT in flags
-                   || ModifierFlags.VIRTUAL in flags
-                   || ModifierFlags.OVERRIDE in flags) {
-                       Report.error (f.source_reference, "abstract, virtual, and override modifiers are not applicable to fields");
-               }
-               if (ModifierFlags.EXTERN in flags) {
-                       f.is_extern = true;
-               }
-               if (ModifierFlags.NEW in flags) {
-                       f.hides = true;
-               }
-               if (accept (TokenType.ASSIGN)) {
-                       f.initializer = parse_expression ();
-               }
-               expect (TokenType.SEMICOLON);
+                       if (ModifierFlags.ABSTRACT in flags
+                               || ModifierFlags.VIRTUAL in flags
+                               || ModifierFlags.OVERRIDE in flags) {
+                               Report.error (f.source_reference, "abstract, virtual, and override modifiers are not applicable to fields");
+                       }
+                       if (ModifierFlags.EXTERN in flags) {
+                               f.is_extern = true;
+                       }
+                       if (ModifierFlags.NEW in flags) {
+                               f.hides = true;
+                       }
+                       if (accept (TokenType.ASSIGN)) {
+                               f.initializer = parse_expression ();
+                       }
 
-               parent.add_field (f);
+                       parent.add_field (f);
+               } while (accept (TokenType.COMMA));
+               expect (TokenType.SEMICOLON);
        }
 
        InitializerList parse_initializer () throws ParseError {