[gtk+/wip/otte/shader] gskslprogram: Split out GskSlDeclaration

[Benjamin Otte <otte src gnome org>]

commit 76aae5ef629439ace129d420fdebef5058cbcd03
Author: Benjamin Otte <otte redhat com>
Date:   Wed Oct 11 02:21:00 2017 +0200

    gskslprogram: Split out GskSlDeclaration
    
    That's the object that will keep the toplevel declarations that make up
    a program.

 gsk/gsksldeclaration.c        |  327 +++++++++++++++++++++++++++++++++++++++++
 gsk/gsksldeclarationprivate.h |   44 ++++++
 gsk/gskslprogram.c            |  180 +++-------------------
 gsk/gsksltypesprivate.h       |    1 +
 gsk/meson.build               |    1 +
 5 files changed, 398 insertions(+), 155 deletions(-)
---
diff --git a/gsk/gsksldeclaration.c b/gsk/gsksldeclaration.c
new file mode 100644
index 0000000..9721e7e
--- /dev/null
+++ b/gsk/gsksldeclaration.c
@@ -0,0 +1,327 @@
+/* GTK - The GIMP Toolkit
+ *   
+ * Copyright © 2017 Benjamin Otte <otte gnome org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include "gsksldeclarationprivate.h"
+
+#include "gskslexpressionprivate.h"
+#include "gskslfunctionprivate.h"
+#include "gskslpreprocessorprivate.h"
+#include "gskslprinterprivate.h"
+#include "gskslscopeprivate.h"
+#include "gsksltokenizerprivate.h"
+#include "gsksltypeprivate.h"
+#include "gskslqualifierprivate.h"
+#include "gskslvariableprivate.h"
+#include "gskspvwriterprivate.h"
+
+#include <string.h>
+
+typedef struct _GskSlDeclarationClass GskSlDeclarationClass;
+
+struct _GskSlDeclaration {
+  const GskSlDeclarationClass *class;
+  guint ref_count;
+};
+
+struct _GskSlDeclarationClass {
+  gsize                 element_size;
+  void                  (* finalize)                            (GskSlDeclaration       *declaration);
+
+  void                  (* print)                               (const GskSlDeclaration *declaration,
+                                                                 GskSlPrinter           *printer);
+  void                  (* write_initializer_spv)               (const GskSlDeclaration *declaration,
+                                                                 GskSpvWriter           *writer);
+};
+
+static gpointer
+gsk_sl_declaration_new (const GskSlDeclarationClass *klass)
+{
+  GskSlDeclaration *declaration;
+
+  declaration = g_slice_alloc0 (klass->element_size);
+
+  declaration->class = klass;
+  declaration->ref_count = 1;
+
+  return declaration;
+}
+
+/* VARIABLE */
+
+typedef struct _GskSlDeclarationVariable GskSlDeclarationVariable;
+
+struct _GskSlDeclarationVariable {
+  GskSlDeclaration parent;
+
+  GskSlVariable *variable;
+  GskSlExpression *initial;
+};
+
+static void
+gsk_sl_declaration_variable_finalize (GskSlDeclaration *declaration)
+{
+  GskSlDeclarationVariable *variable = (GskSlDeclarationVariable *) declaration;
+
+  gsk_sl_variable_unref (variable->variable);
+  if (variable->initial)
+    gsk_sl_expression_unref (variable->initial);
+}
+
+static void
+gsk_sl_declaration_variable_print (const GskSlDeclaration *declaration,
+                                   GskSlPrinter           *printer)
+{
+  GskSlDeclarationVariable *variable = (GskSlDeclarationVariable *) declaration;
+
+  gsk_sl_variable_print (variable->variable, printer);
+  if (variable->initial)
+    {
+      gsk_sl_printer_append (printer, " = ");
+      gsk_sl_expression_print (variable->initial, printer);
+    }
+  gsk_sl_printer_append (printer, ";");
+  gsk_sl_printer_newline (printer);
+}
+
+static void
+gsk_sl_declaration_variable_write_initializer_spv (const GskSlDeclaration *declaration,
+                                                   GskSpvWriter           *writer)
+{
+  GskSlDeclarationVariable *variable = (GskSlDeclarationVariable *) declaration;
+  
+  /* make sure it's written */
+  gsk_spv_writer_get_id_for_variable (writer, variable->variable);
+
+  if (variable->initial && ! gsk_sl_variable_get_initial_value (variable->variable))
+    {
+      gsk_sl_variable_store_spv (variable->variable,
+                                 writer,
+                                 gsk_sl_expression_write_spv (variable->initial, writer));
+    }
+}
+
+static const GskSlDeclarationClass GSK_SL_DECLARATION_VARIABLE = {
+  sizeof (GskSlDeclarationVariable),
+  gsk_sl_declaration_variable_finalize,
+  gsk_sl_declaration_variable_print,
+  gsk_sl_declaration_variable_write_initializer_spv
+};
+
+/* FUNCTION */
+ 
+typedef struct _GskSlDeclarationFunction GskSlDeclarationFunction;
+
+struct _GskSlDeclarationFunction {
+  GskSlDeclaration parent;
+
+  GskSlFunction *function;
+};
+
+static void
+gsk_sl_declaration_function_free (GskSlDeclaration *declaration)
+{
+  GskSlDeclarationFunction *function = (GskSlDeclarationFunction *) declaration;
+ 
+  gsk_sl_function_unref (function->function);
+}
+ 
+static void
+gsk_sl_declaration_function_print (const GskSlDeclaration *declaration,
+                                   GskSlPrinter         *printer)
+{
+  GskSlDeclarationFunction *function = (GskSlDeclarationFunction *) declaration;
+
+  gsk_sl_function_print (function->function, printer);
+}
+ 
+static void
+gsk_sl_declaration_function_write_initializer_spv (const GskSlDeclaration *declaration,
+                                                   GskSpvWriter           *writer)
+{
+  /* functions are written out as-needed, so no need to force it */
+}
+ 
+static const GskSlDeclarationClass GSK_SL_DECLARATION_FUNCTION = {
+  sizeof (GskSlDeclarationFunction),
+  gsk_sl_declaration_function_free,
+  gsk_sl_declaration_function_print,
+  gsk_sl_declaration_function_write_initializer_spv
+};
+
+/* API */
+
+static GskSlDeclaration *
+gsk_sl_declaration_parse_variable (GskSlScope           *scope,
+                                   GskSlPreprocessor    *preproc,
+                                   const GskSlQualifier *qualifier,
+                                   GskSlType            *type,
+                                   const char           *name)
+{
+  GskSlDeclarationVariable *variable;
+  const GskSlToken *token;
+
+  token = gsk_sl_preprocessor_get (preproc);
+  if (gsk_sl_token_is (token, GSK_SL_TOKEN_EQUAL))
+    {
+      GskSlExpression *initial;
+
+      gsk_sl_preprocessor_consume (preproc, NULL);
+
+      initial = gsk_sl_expression_parse_assignment (scope, preproc);
+
+      if (!gsk_sl_type_can_convert (type, gsk_sl_expression_get_return_type (initial)))
+        {
+          gsk_sl_preprocessor_error (preproc, TYPE_MISMATCH,
+                                     "Cannot convert from initializer type %s to variable type %s",
+                                     gsk_sl_type_get_name (gsk_sl_expression_get_return_type (initial)),
+                                     gsk_sl_type_get_name (type));
+          gsk_sl_expression_unref (initial);
+        }
+
+      token = gsk_sl_preprocessor_get (preproc);
+    }
+
+  if (!gsk_sl_token_is (token, GSK_SL_TOKEN_SEMICOLON))
+    {
+      gsk_sl_preprocessor_error (preproc, SYNTAX, "No semicolon at end of variable declaration.");
+      gsk_sl_preprocessor_sync (preproc, GSK_SL_TOKEN_SEMICOLON);
+    }
+  gsk_sl_preprocessor_consume (preproc, NULL);
+
+  variable = gsk_sl_declaration_new (&GSK_SL_DECLARATION_VARIABLE);
+  variable->variable = gsk_sl_variable_new (name, type, qualifier, NULL);
+  gsk_sl_scope_add_variable (scope, variable->variable);
+
+  return &variable->parent;
+}
+
+GskSlDeclaration *
+gsk_sl_declaration_parse (GskSlScope        *scope,
+                          GskSlPreprocessor *preproc)
+{
+  GskSlDeclaration *result;
+  GskSlType *type;
+  const GskSlToken *token;
+  GskSlQualifier qualifier;
+  char *name;
+
+  gsk_sl_qualifier_parse (&qualifier, scope, preproc, GSK_SL_QUALIFIER_GLOBAL);
+
+  type = gsk_sl_type_new_parse (scope, preproc);
+
+  token = gsk_sl_preprocessor_get (preproc);
+  if (gsk_sl_token_is (token, GSK_SL_TOKEN_SEMICOLON))
+    {
+      result = gsk_sl_declaration_parse_variable (scope, preproc, &qualifier, type, NULL);
+      gsk_sl_preprocessor_consume (preproc, NULL);
+      gsk_sl_type_unref (type);
+      return result;
+    }
+  else if (!gsk_sl_token_is (token, GSK_SL_TOKEN_IDENTIFIER))
+    {
+      gsk_sl_preprocessor_error (preproc, SYNTAX, "Expected a variable name");
+      gsk_sl_preprocessor_consume (preproc, NULL);
+      gsk_sl_type_unref (type);
+      return NULL;
+    }
+
+  name = g_strdup (token->str);
+  gsk_sl_preprocessor_consume (preproc, NULL);
+
+  token = gsk_sl_preprocessor_get (preproc);
+
+  if (gsk_sl_token_is (token, GSK_SL_TOKEN_LEFT_PAREN))
+    {
+      GskSlFunctionMatcher matcher;
+      GskSlDeclarationFunction *function;
+
+      function = gsk_sl_declaration_new (&GSK_SL_DECLARATION_FUNCTION);
+      function->function = gsk_sl_function_new_parse (scope,
+                                                      preproc,
+                                                      type,
+                                                      name);
+      gsk_sl_scope_match_function (scope, &matcher, gsk_sl_function_get_name (function->function));
+      gsk_sl_function_matcher_match_function (&matcher, function->function);
+      if (gsk_sl_function_matcher_has_matches (&matcher))
+        gsk_sl_preprocessor_error (preproc, DECLARATION, "A function with the same prototype has already 
been defined.");
+      else
+        gsk_sl_scope_add_function (scope, function->function);
+      gsk_sl_function_matcher_finish (&matcher);
+      result = &function->parent;
+    }
+  else
+    {
+      result = gsk_sl_declaration_parse_variable (scope, preproc, &qualifier, type, name);
+    }
+
+  g_free (name);
+  gsk_sl_type_unref (type);
+
+  return result;
+}
+
+GskSlDeclaration *
+gsk_sl_declaration_ref (GskSlDeclaration *declaration)
+{
+  g_return_val_if_fail (declaration != NULL, NULL);
+
+  declaration->ref_count += 1;
+
+  return declaration;
+}
+
+void
+gsk_sl_declaration_unref (GskSlDeclaration *declaration)
+{
+  if (declaration == NULL)
+    return;
+
+  declaration->ref_count -= 1;
+  if (declaration->ref_count > 0)
+    return;
+
+  declaration->class->finalize (declaration);
+
+  g_slice_free1 (declaration->class->element_size, declaration);
+}
+
+GskSlFunction *
+gsk_sl_declaration_get_function (GskSlDeclaration *declaration)
+{
+  if (declaration->class != &GSK_SL_DECLARATION_FUNCTION)
+    return NULL;
+
+  return ((GskSlDeclarationFunction *) declaration)->function;
+}
+
+void
+gsk_sl_declaration_print (const GskSlDeclaration *declaration,
+                          GskSlPrinter           *printer)
+{
+  declaration->class->print (declaration, printer);
+}
+
+void
+gsk_sl_declaration_write_initializer_spv (const GskSlDeclaration *declaration,
+                                          GskSpvWriter           *writer)
+{
+  declaration->class->write_initializer_spv (declaration, writer);
+}
+
diff --git a/gsk/gsksldeclarationprivate.h b/gsk/gsksldeclarationprivate.h
new file mode 100644
index 0000000..db624fd
--- /dev/null
+++ b/gsk/gsksldeclarationprivate.h
@@ -0,0 +1,44 @@
+/* GTK - The GIMP Toolkit
+ *
+ * Copyright © 2017 Benjamin Otte <otte gnome org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GSK_SL_DECLARATION_PRIVATE_H__
+#define __GSK_SL_DECLARATION_PRIVATE_H__
+
+#include <glib.h>
+
+#include "gsk/gsksltypesprivate.h"
+
+G_BEGIN_DECLS
+
+GskSlDeclaration *      gsk_sl_declaration_parse                (GskSlScope             *scope,
+                                                                 GskSlPreprocessor      *preproc);
+
+GskSlDeclaration *      gsk_sl_declaration_ref                  (GskSlDeclaration       *declaration);
+void                    gsk_sl_declaration_unref                (GskSlDeclaration       *declaration);
+
+GskSlFunction *         gsk_sl_declaration_get_function         (GskSlDeclaration       *declaration);
+
+void                    gsk_sl_declaration_print                (const GskSlDeclaration *declaration,
+                                                                 GskSlPrinter           *printer);
+
+void                    gsk_sl_declaration_write_initializer_spv(const GskSlDeclaration *declaration,
+                                                                 GskSpvWriter           *writer);
+
+G_END_DECLS
+
+#endif /* __GSK_SL_DECLARATION_PRIVATE_H__ */
diff --git a/gsk/gskslprogram.c b/gsk/gskslprogram.c
index 4d4eb2b..bbea1ca 100644
--- a/gsk/gskslprogram.c
+++ b/gsk/gskslprogram.c
@@ -20,24 +20,21 @@
 
 #include "gskslprogramprivate.h"
 
+#include "gsksldeclarationprivate.h"
 #include "gskslexpressionprivate.h"
 #include "gskslfunctionprivate.h"
 #include "gskslpreprocessorprivate.h"
 #include "gskslprinterprivate.h"
 #include "gskslscopeprivate.h"
-#include "gskslqualifierprivate.h"
 #include "gsksltokenizerprivate.h"
 #include "gsksltypeprivate.h"
-#include "gskslvalueprivate.h"
-#include "gskslvariableprivate.h"
 #include "gskspvwriterprivate.h"
 
 struct _GskSlProgram {
   GObject parent_instance;
 
   GskSlScope *scope;
-  GSList *variables;
-  GSList *functions;
+  GSList *declarations;
 };
 
 G_DEFINE_TYPE (GskSlProgram, gsk_sl_program, G_TYPE_OBJECT)
@@ -47,8 +44,7 @@ gsk_sl_program_dispose (GObject *object)
 {
   GskSlProgram *program = GSK_SL_PROGRAM (object);
 
-  g_slist_free_full (program->variables, (GDestroyNotify) gsk_sl_variable_unref);
-  g_slist_free_full (program->functions, (GDestroyNotify) gsk_sl_function_unref);
+  g_slist_free_full (program->declarations, (GDestroyNotify) gsk_sl_declaration_unref);
   gsk_sl_scope_unref (program->scope);
 
   G_OBJECT_CLASS (gsk_sl_program_parent_class)->dispose (object);
@@ -68,144 +64,23 @@ gsk_sl_program_init (GskSlProgram *program)
   program->scope = gsk_sl_scope_new (NULL, NULL);
 }
 
-static void
-gsk_sl_program_parse_variable (GskSlProgram         *program,
-                               GskSlScope           *scope,
-                               GskSlPreprocessor    *preproc,
-                               const GskSlQualifier *qualifier,
-                               GskSlType            *type,
-                               const char           *name)
-{
-  GskSlVariable *variable;
-  const GskSlToken *token;
-  GskSlValue *value = NULL;
-
-  token = gsk_sl_preprocessor_get (preproc);
-  if (gsk_sl_token_is (token, GSK_SL_TOKEN_EQUAL))
-    {
-      GskSlValue *unconverted;
-      GskSlExpression *initial;
-
-      gsk_sl_preprocessor_consume (preproc, program);
-
-      initial = gsk_sl_expression_parse_assignment (scope, preproc);
-
-      if (!gsk_sl_type_can_convert (type, gsk_sl_expression_get_return_type (initial)))
-        {
-          gsk_sl_preprocessor_error (preproc, TYPE_MISMATCH,
-                                     "Cannot convert from initializer type %s to variable type %s",
-                                     gsk_sl_type_get_name (gsk_sl_expression_get_return_type (initial)),
-                                     gsk_sl_type_get_name (type));
-          gsk_sl_expression_unref (initial);
-        }
-      else
-        {
-          unconverted = gsk_sl_expression_get_constant (initial);
-          gsk_sl_expression_unref (initial);
-          if (unconverted)
-            {
-              value = gsk_sl_value_new_convert (unconverted, type);
-              gsk_sl_value_free (unconverted);
-            }
-          else 
-            {
-              gsk_sl_preprocessor_error (preproc, UNSUPPORTED, "Non-constant initializer are not supported 
yet.");
-              value = NULL;
-            }
-        }
-
-      token = gsk_sl_preprocessor_get (preproc);
-    }
-
-  if (!gsk_sl_token_is (token, GSK_SL_TOKEN_SEMICOLON))
-    {
-      gsk_sl_preprocessor_error (preproc, SYNTAX, "No semicolon at end of variable declaration.");
-      gsk_sl_preprocessor_sync (preproc, GSK_SL_TOKEN_SEMICOLON);
-    }
-  gsk_sl_preprocessor_consume (preproc, NULL);
-
-  variable = gsk_sl_variable_new (name, type, qualifier, value);
-      
-  program->variables = g_slist_append (program->variables, variable);
-  gsk_sl_scope_add_variable (scope, variable);
-}
-
-static void
-gsk_sl_program_parse_declaration (GskSlProgram      *program,
-                                  GskSlScope        *scope,
-                                  GskSlPreprocessor *preproc)
-{
-  GskSlType *type;
-  const GskSlToken *token;
-  GskSlQualifier qualifier;
-  char *name;
-
-  gsk_sl_qualifier_parse (&qualifier, scope, preproc, GSK_SL_QUALIFIER_GLOBAL);
-
-  type = gsk_sl_type_new_parse (scope, preproc);
-
-  token = gsk_sl_preprocessor_get (preproc);
-  if (gsk_sl_token_is (token, GSK_SL_TOKEN_SEMICOLON))
-    {
-      GskSlVariable *variable = gsk_sl_variable_new (NULL, type, &qualifier, NULL);
-      program->variables = g_slist_append (program->variables, variable);
-      gsk_sl_preprocessor_consume (preproc, program);
-      gsk_sl_type_unref (type);
-      return;
-    }
-  else if (!gsk_sl_token_is (token, GSK_SL_TOKEN_IDENTIFIER))
-    {
-      gsk_sl_preprocessor_error (preproc, SYNTAX, "Expected a variable name");
-      gsk_sl_preprocessor_consume (preproc, program);
-      gsk_sl_type_unref (type);
-      return;
-    }
-
-  name = g_strdup (token->str);
-  gsk_sl_preprocessor_consume (preproc, program);
-
-  token = gsk_sl_preprocessor_get (preproc);
-
-  if (gsk_sl_token_is (token, GSK_SL_TOKEN_LEFT_PAREN))
-    {
-      GskSlFunctionMatcher matcher;
-      GskSlFunction *function;
-
-      function = gsk_sl_function_new_parse (scope,
-                                            preproc,
-                                            type,
-                                            name);
-      gsk_sl_scope_match_function (scope, &matcher, gsk_sl_function_get_name (function));
-      gsk_sl_function_matcher_match_function (&matcher, function);
-      if (gsk_sl_function_matcher_has_matches (&matcher))
-        gsk_sl_preprocessor_error (preproc, DECLARATION, "A function with the same prototype has already 
been defined.");
-      else
-        gsk_sl_scope_add_function (scope, function);
-      gsk_sl_function_matcher_finish (&matcher);
-      program->functions = g_slist_append (program->functions, function);
-    }
-  else
-    {
-      gsk_sl_program_parse_variable (program, scope, preproc, &qualifier, type, name);
-    }
-
-  g_free (name);
-
-  return;
-}
-
 void
 gsk_sl_program_parse (GskSlProgram      *program,
                       GskSlPreprocessor *preproc)
 {
+  GskSlDeclaration *declaration;
   const GskSlToken *token;
 
   for (token = gsk_sl_preprocessor_get (preproc);
        !gsk_sl_token_is (token, GSK_SL_TOKEN_EOF);
        token = gsk_sl_preprocessor_get (preproc))
     {
-      gsk_sl_program_parse_declaration (program, program->scope, preproc);
+      declaration = gsk_sl_declaration_parse (program->scope, preproc);
+      if (declaration)
+        program->declarations = g_slist_prepend (program->declarations, declaration);
     }
+
+  program->declarations = g_slist_reverse (program->declarations);
 }
 
 void
@@ -213,6 +88,8 @@ gsk_sl_program_print (GskSlProgram *program,
                       GString      *string)
 {
   GskSlPrinter *printer;
+  GskSlFunction *function;
+  gboolean need_newline = FALSE;
   GSList *l;
   char *str;
 
@@ -221,25 +98,16 @@ gsk_sl_program_print (GskSlProgram *program,
 
   printer = gsk_sl_printer_new ();
 
-  for (l = program->variables; l; l = l->next)
+  for (l = program->declarations; l; l = l->next)
     {
-      const GskSlValue *value;
-      gsk_sl_variable_print (l->data, printer);
-      value = gsk_sl_variable_get_initial_value (l->data);
-      if (value)
-        {
-          gsk_sl_printer_append (printer, " = ");
-          gsk_sl_value_print (value, printer);
-        }
-      gsk_sl_printer_append (printer, ";");
-      gsk_sl_printer_newline (printer);
-    }
+      function = gsk_sl_declaration_get_function (l->data);
 
-  for (l = program->functions; l; l = l->next)
-    {
-      if (l != program->functions || program->variables != NULL)
+      if ((function || need_newline) && l != program->declarations)
         gsk_sl_printer_newline (printer);
-      gsk_sl_function_print (l->data, printer);
+
+      gsk_sl_declaration_print (l->data, printer);
+
+      need_newline = function != NULL;
     }
 
   str = gsk_sl_printer_write_to_string (printer);
@@ -256,8 +124,8 @@ gsk_sl_program_write_spv_initializer (GskSpvWriter *writer,
   GskSlProgram *program = data;
   GSList *l;
 
-  for (l = program->variables; l; l = l->next)
-    gsk_spv_writer_get_id_for_variable (writer, l->data);
+  for (l = program->declarations; l; l = l->next)
+    gsk_sl_declaration_write_initializer_spv (l->data, writer);
 }
 
 static GskSlFunction *
@@ -265,10 +133,12 @@ gsk_sl_program_get_entry_point (GskSlProgram *program)
 {
   GSList *l;
 
-  for (l = program->functions; l; l = l->next)
+  for (l = program->declarations; l; l = l->next)
     {
-      if (g_str_equal (gsk_sl_function_get_name (l->data), "main"))
-        return l->data;
+      GskSlFunction *function = gsk_sl_declaration_get_function (l->data);
+
+      if (function && g_str_equal (gsk_sl_function_get_name (function), "main"))
+        return function;
     }
 
   return NULL;
diff --git a/gsk/gsksltypesprivate.h b/gsk/gsksltypesprivate.h
index 9c24243..dc11f8d 100644
--- a/gsk/gsksltypesprivate.h
+++ b/gsk/gsksltypesprivate.h
@@ -21,6 +21,7 @@
 
 #include <gsk/gsktypes.h>
 
+typedef struct _GskSlDeclaration        GskSlDeclaration;
 typedef struct _GskSlExpression         GskSlExpression;
 typedef struct _GskSlFunction           GskSlFunction;
 typedef struct _GskSlFunctionMatcher    GskSlFunctionMatcher;
diff --git a/gsk/meson.build b/gsk/meson.build
index e7023c2..7f279d1 100644
--- a/gsk/meson.build
+++ b/gsk/meson.build
@@ -36,6 +36,7 @@ gsk_private_sources = files([
   'gskprofiler.c',
   'gskshaderbuilder.c',
   'gskslbinary.c',
+  'gsksldeclaration.c',
   'gsksldefine.c',
   'gskslexpression.c',
   'gskslfunction.c',