[gtk+/wip/otte/shader: 46/69] gskslstatement: Parse compound statements

[Benjamin Otte <otte src gnome org>]

commit e013040fde97e8a946df9198bb6703d5747ef1f3
Author: Benjamin Otte <otte redhat com>
Date:   Sat Sep 30 15:08:37 2017 +0200

    gskslstatement: Parse compound statements

 gsk/gskslstatement.c        |  113 +++++++++++++++++++++++++++++++++++++++++-
 gsk/gskslstatementprivate.h |    3 +
 2 files changed, 113 insertions(+), 3 deletions(-)
---
diff --git a/gsk/gskslstatement.c b/gsk/gskslstatement.c
index 77e2182..43d2e74 100644
--- a/gsk/gskslstatement.c
+++ b/gsk/gskslstatement.c
@@ -67,9 +67,6 @@ gsk_sl_statement_alloc (const GskSlStatementClass *klass,
 
 /* EMPTY */
 
-/* FIXME: This exists only so we dont return NULL from empty statements (ie just a semicolon)
- */
-
 typedef struct _GskSlStatementEmpty GskSlStatementEmpty;
 
 struct _GskSlStatementEmpty {
@@ -104,6 +101,69 @@ static const GskSlStatementClass GSK_SL_STATEMENT_EMPTY = {
   gsk_sl_statement_empty_write_spv
 };
 
+/* COMPOUND */
+
+typedef struct _GskSlStatementCompound GskSlStatementCompound;
+
+struct _GskSlStatementCompound {
+  GskSlStatement parent;
+
+  GskSlScope *scope;
+  GSList *statements;
+};
+
+static void
+gsk_sl_statement_compound_free (GskSlStatement *statement)
+{
+  GskSlStatementCompound *compound = (GskSlStatementCompound *) statement;
+
+  g_slist_free_full (compound->statements, (GDestroyNotify) gsk_sl_statement_unref);
+  if (compound->scope)
+    gsk_sl_scope_unref (compound->scope);
+
+  g_slice_free (GskSlStatementCompound, compound);
+}
+
+static void
+gsk_sl_statement_compound_print (const GskSlStatement *statement,
+                                 GskSlPrinter         *printer)
+{
+  GskSlStatementCompound *compound = (GskSlStatementCompound *) statement;
+  GSList *l;
+
+  gsk_sl_printer_append (printer, "{");
+  gsk_sl_printer_push_indentation (printer);
+  for (l = compound->statements; l; l = l->next)
+    {
+      gsk_sl_printer_newline (printer);
+      gsk_sl_statement_print (l->data, printer);
+    }
+  gsk_sl_printer_pop_indentation (printer);
+  gsk_sl_printer_newline (printer);
+  gsk_sl_printer_append (printer, "}");
+}
+
+static guint32
+gsk_sl_statement_compound_write_spv (const GskSlStatement *statement,
+                                     GskSpvWriter         *writer)
+{
+  GskSlStatementCompound *compound = (GskSlStatementCompound *) statement;
+  GSList *l;
+
+  for (l = compound->statements; l; l = l->next)
+    {
+      gsk_sl_statement_write_spv (l->data, writer);
+    }
+
+  return 0;
+}
+
+static const GskSlStatementClass GSK_SL_STATEMENT_COMPOUND = {
+  gsk_sl_statement_compound_free,
+  gsk_sl_statement_compound_print,
+  gsk_sl_statement_compound_write_spv
+};
+
 /* DECLARATION */
 
 typedef struct _GskSlStatementDeclaration GskSlStatementDeclaration;
@@ -329,6 +389,50 @@ gsk_sl_statement_parse_declaration (GskSlScope        *scope,
 }
 
 GskSlStatement *
+gsk_sl_statement_parse_compound (GskSlScope        *scope,
+                                 GskSlPreprocessor *preproc,
+                                 gboolean           new_scope)
+{
+  GskSlStatementCompound *compound;
+  const GskSlToken *token;
+
+  compound = gsk_sl_statement_new (GskSlStatementCompound, &GSK_SL_STATEMENT_COMPOUND);
+  if (new_scope)
+    {
+      compound->scope = gsk_sl_scope_new (scope, gsk_sl_scope_get_return_type (scope));
+      scope = compound->scope;
+    }
+
+  token = gsk_sl_preprocessor_get (preproc);
+  if (!gsk_sl_token_is (token, GSK_SL_TOKEN_LEFT_BRACE))
+    {
+      gsk_sl_preprocessor_error (preproc, SYNTAX, "Expected an opening \"{\"");
+      return (GskSlStatement *) compound;
+    }
+  gsk_sl_preprocessor_consume (preproc, compound);
+
+  for (token = gsk_sl_preprocessor_get (preproc);
+       !gsk_sl_token_is (token, GSK_SL_TOKEN_RIGHT_BRACE) && !gsk_sl_token_is (token, GSK_SL_TOKEN_EOF);
+       token = gsk_sl_preprocessor_get (preproc))
+    {
+      GskSlStatement *statement;
+
+      statement = gsk_sl_statement_parse (scope, preproc);
+      compound->statements = g_slist_prepend (compound->statements, statement);
+    }
+  compound->statements = g_slist_reverse (compound->statements);
+
+  if (!gsk_sl_token_is (token, GSK_SL_TOKEN_RIGHT_BRACE))
+    {
+      gsk_sl_preprocessor_error (preproc, SYNTAX, "Expected closing \"}\" at end of block.");
+      gsk_sl_preprocessor_sync (preproc, GSK_SL_TOKEN_RIGHT_BRACE);
+    }
+  gsk_sl_preprocessor_consume (preproc, compound);
+  
+  return (GskSlStatement *) compound;
+}
+
+GskSlStatement *
 gsk_sl_statement_parse (GskSlScope        *scope,
                         GskSlPreprocessor *preproc)
 {
@@ -347,6 +451,9 @@ gsk_sl_statement_parse (GskSlScope        *scope,
       gsk_sl_preprocessor_error (preproc, SYNTAX, "Unexpected end of document");
       return (GskSlStatement *) gsk_sl_statement_new (GskSlStatementEmpty, &GSK_SL_STATEMENT_EMPTY);
 
+    case GSK_SL_TOKEN_LEFT_BRACE:
+      return gsk_sl_statement_parse_compound (scope, preproc, TRUE);
+
     case GSK_SL_TOKEN_CONST:
     case GSK_SL_TOKEN_IN:
     case GSK_SL_TOKEN_OUT:
diff --git a/gsk/gskslstatementprivate.h b/gsk/gskslstatementprivate.h
index a107d26..f8ae5eb 100644
--- a/gsk/gskslstatementprivate.h
+++ b/gsk/gskslstatementprivate.h
@@ -27,6 +27,9 @@ G_BEGIN_DECLS
 
 GskSlStatement *        gsk_sl_statement_parse                  (GskSlScope             *scope,
                                                                  GskSlPreprocessor      *preproc);
+GskSlStatement *        gsk_sl_statement_parse_compound         (GskSlScope             *scope,
+                                                                 GskSlPreprocessor      *preproc,
+                                                                 gboolean                new_scope);
 
 GskSlStatement *        gsk_sl_statement_ref                    (GskSlStatement         *statement);
 void                    gsk_sl_statement_unref                  (GskSlStatement         *statement);