From 4e8cd3c84359f1ad6b53b0bdc0c15b19edb792e7 Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Wed, 7 Dec 2005 11:52:05 +0000 Subject: [PATCH] gst/parse/grammar.y: Remove handling of { } for threads. Original commit message from CVS: * gst/parse/grammar.y: Remove handling of { } for threads. --- ChangeLog | 5 +++++ gst/parse/grammar.y | 9 ++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7ab2edf322..fdc8ce8449 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-12-07 Michael Smith + + * gst/parse/grammar.y: + Remove handling of { } for threads. + 2005-12-06 David Schleef * libs/gst/base/gstbasetransform.c: speling fix. diff --git a/gst/parse/grammar.y b/gst/parse/grammar.y index 8f0eaad672..d335c30f4a 100644 --- a/gst/parse/grammar.y +++ b/gst/parse/grammar.y @@ -563,7 +563,7 @@ static int yyerror (const char *s); %type element %type

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); }