gst/parse/grammar.y: Remove handling of { } for threads.

Original commit message from CVS:
* gst/parse/grammar.y:
Remove handling of { } for threads.

diff --git a/ChangeLog b/ChangeLog
index 7ab2edf..fdc8ce8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-07  Michael Smith  <msmith@fluendo.com>
+
+       * gst/parse/grammar.y:
+         Remove handling of { } for threads.
+
 2005-12-06  David Schleef  <ds@schleef.org>
 
        * libs/gst/base/gstbasetransform.c: speling fix.

diff --git a/gst/parse/grammar.y b/gst/parse/grammar.y
index 8f0eaad..d335c30 100644 (file)
--- a/gst/parse/grammar.y
+++ b/gst/parse/grammar.y
@@ -563,7 +563,7 @@ static int yyerror (const char *s);
 %type <e> element 
 %type <p> padlist pads assignments
 
-%left '{' '}' '(' ')'
+%left '(' ')'
 %left ','
 %right '.'
 %left '!' '='
@@ -587,18 +587,13 @@ element:  IDENTIFIER                    { $$ = gst_element_factory_make ($1, NULL);
 assignments:   /* NOP */                     { $$ = NULL; }
        |       assignments ASSIGNMENT        { $$ = g_slist_prepend ($1, $2); }
        ;               
-bin:           '{' assignments chain '}' { GST_BIN_MAKE ($$, "thread", $3, $2); }
-        |       '(' assignments chain ')' { GST_BIN_MAKE ($$, "bin", $3, $2); }
+bin:           '(' assignments chain ')' { GST_BIN_MAKE ($$, "bin", $3, $2); }
         |       BINREF assignments chain ')'  { GST_BIN_MAKE ($$, $1, $3, $2); 
                                                gst_parse_strfree ($1);
                                              }
-       |       '{' assignments '}'           { GST_BIN_MAKE ($$, "thread", NULL, $2); }
-       |       '(' assignments '}'           { GST_BIN_MAKE ($$, "thread", NULL, $2); }
         |       BINREF assignments ')'       { GST_BIN_MAKE ($$, $1, NULL, $2); 
                                                gst_parse_strfree ($1);
                                              }
-       |       '{' assignments error '}'     { GST_BIN_MAKE ($$, "thread", NULL, $2); }
-       |       '(' assignments error '}'     { GST_BIN_MAKE ($$, "thread", NULL, $2); }
         |       BINREF assignments error ')'  { GST_BIN_MAKE ($$, $1, NULL, $2); 
                                                gst_parse_strfree ($1);
                                              }