Changes to handle compilers that don't have variadic macro support. In particular...

[platform/upstream/gstreamer.git] / gst / parse / grammar.y

diff --git a/gst/parse/grammar.y b/gst/parse/grammar.y
index 086a893..27061c5 100644 (file)
--- a/gst/parse/grammar.y
+++ b/gst/parse/grammar.y
@@ -95,12 +95,9 @@ typedef struct {
 
 #ifdef G_HAVE_ISO_VARARGS
 #define SET_ERROR(error, type, ...) G_STMT_START{ \
-  if (error) { \
-    if (*(error)) { \
-      g_warning (__VA_ARGS__); \
-    } else { \
-      g_set_error ((error), GST_PARSE_ERROR, (type), __VA_ARGS__); \
-    }\
+  GST_CAT_ERROR (GST_CAT_PIPELINE, __VA_ARGS__); \
+  if ((error) && !*(error)) { \
+    g_set_error ((error), GST_PARSE_ERROR, (type), __VA_ARGS__); \
   } \
 }G_STMT_END
 #define ERROR(type, ...) SET_ERROR (((graph_t *) graph)->error, (type), __VA_ARGS__ )
@@ -120,12 +117,9 @@ typedef struct {
 #elif defined(G_HAVE_GNUC_VARARGS)
 
 #define SET_ERROR(error, type, args...) G_STMT_START{ \
-  if (error) { \
-    if (*(error)) { \
-      g_warning ( args ); \
-    } else { \
-      g_set_error ((error), GST_PARSE_ERROR, (type), args ); \
-    }\
+  GST_CAT_ERROR (GST_CAT_PIPELINE, args ); \
+  if ((error) && !*(error)) { \
+    g_set_error ((error), GST_PARSE_ERROR, (type), args ); \
   } \
 }G_STMT_END
 #define ERROR(type, args...) SET_ERROR (((graph_t *) graph)->error, (type) , args )
@@ -142,15 +136,12 @@ typedef struct {
    }G_STMT_END
 #endif
 
-#else
+#elif defined(G_HAVE_ISO_VARARGS)
 
 #define SET_ERROR(error, type, ...) G_STMT_START{ \
-  if (error) { \
-    if (*(error)) { \
-      g_warning ("error while parsing"); \
-    } else { \
-      g_set_error ((error), GST_PARSE_ERROR, (type), "error while parsing"); \
-    }\
+  GST_CAT_ERROR (GST_CAT_PIPELINE, "error while parsing" ); \
+  if ((error) && !*(error)) { \
+    g_set_error ((error), GST_PARSE_ERROR, (type), "error while parsing"); \
   } \
 }G_STMT_END
 #define ERROR(type, ...) SET_ERROR (((graph_t *) graph)->error, (type), "error while parsing")
@@ -158,19 +149,58 @@ typedef struct {
 #  define YYDEBUG 1
 #endif
 
-#endif /* G_HAVE_ISO_VARARGS */
+#else
+
+static inline void
+SET_ERROR (GError **error, gint type, const char *format, ...)
+{
+  if (error) {
+    if (*error) {
+      g_warning ("error while parsing");
+    } else {
+      va_list varargs;
+      char *string;
+
+      va_start (varargs, format);
+      string = g_strdup_vprintf (format, varargs);
+      va_end (varargs);
+      
+      g_set_error (error, GST_PARSE_ERROR, type, string);
+
+      g_free (string);
+    }
+  }
+}
+
+#ifndef GST_DISABLE_GST_DEBUG
+#  define YYDEBUG 1
+static inline void
+YYPRINTF(const char *format, ...)
+{
+  va_list varargs;
+  gchar *temp;
+  
+  va_start (varargs, format);
+  temp = g_strdup_vprintf ( format, varargs );
+  GST_CAT_LOG (GST_CAT_PIPELINE, "%s", temp);
+  g_free (temp);
+  va_end (varargs);
+}
+#endif
+
+#endif
 
 #define GST_BIN_MAKE(res, type, chainval, assign) G_STMT_START{ \
   chain_t *chain = chainval; \
   GSList *walk; \
   GstBin *bin = (GstBin *) gst_element_factory_make (type, NULL); \
   if (!chain) { \
-    ERROR (GST_PARSE_ERROR_EMPTY_BIN, _("specified empty bin \"%s\", not allowed"), type); \
+    SET_ERROR (((graph_t *) graph)->error, GST_PARSE_ERROR_EMPTY_BIN, _("specified empty bin \"%s\", not allowed"), type); \
     g_slist_foreach (assign, (GFunc) gst_parse_strfree, NULL); \
     g_slist_free (assign); \
     YYERROR; \
   } else if (!bin) { \
-    ERROR (GST_PARSE_ERROR_NO_SUCH_ELEMENT, _("no bin \"%s\", skipping"), type); \
+    SET_ERROR (((graph_t *) graph)->error, GST_PARSE_ERROR_NO_SUCH_ELEMENT, _("no bin \"%s\", skipping"), type); \
     g_slist_foreach (assign, (GFunc) gst_parse_strfree, NULL); \
     g_slist_free (assign); \
     res = chain; \
@@ -308,7 +338,7 @@ gst_parse_element_set (gchar *value, GstElement *element, graph_t *graph)
     }
     g_object_set_property (G_OBJECT (element), value, &v); 
   } else { 
-    ERROR (GST_PARSE_ERROR_NO_SUCH_PROPERTY, _("no property \"%s\" in element \"%s\""), value, GST_ELEMENT_NAME (element)); 
+    SET_ERROR (((graph_t *) graph)->error, GST_PARSE_ERROR_NO_SUCH_PROPERTY, _("no property \"%s\" in element \"%s\""), value, GST_ELEMENT_NAME (element)); 
   }
 
 out:
@@ -320,12 +350,12 @@ out:
   return;
   
 error:
-  ERROR (GST_PARSE_ERROR_COULD_NOT_SET_PROPERTY,
+  SET_ERROR (((graph_t *) graph)->error, GST_PARSE_ERROR_COULD_NOT_SET_PROPERTY,
          _("could not set property \"%s\" in element \"%s\" to \"%s\""), 
         value, GST_ELEMENT_NAME (element), pos); 
   goto out;
 error_conversion:
-  ERROR (GST_PARSE_ERROR_COULD_NOT_SET_PROPERTY,
+  SET_ERROR (((graph_t *) graph)->error, GST_PARSE_ERROR_COULD_NOT_SET_PROPERTY,
          _("could not convert \"%s\" so that it fits property \"%s\" in element \"%s\""),
          pos, value, GST_ELEMENT_NAME (element)); 
   goto out;
@@ -511,7 +541,7 @@ success:
   return 0;
   
 error:
-  ERROR (GST_PARSE_ERROR_LINK, _("could not link %s to %s"), GST_ELEMENT_NAME (src), GST_ELEMENT_NAME (sink));
+  SET_ERROR (((graph_t *) graph)->error, GST_PARSE_ERROR_LINK, _("could not link %s to %s"), GST_ELEMENT_NAME (src), GST_ELEMENT_NAME (sink));
   gst_parse_free_link (link);
   return -1;
 }
@@ -556,7 +586,7 @@ static int yyerror (const char *s);
 
 element:       IDENTIFIER                    { $$ = gst_element_factory_make ($1, NULL); 
                                                if (!$$)
-                                                 ERROR (GST_PARSE_ERROR_NO_SUCH_ELEMENT, _("no element \"%s\""), $1);
+                                                 SET_ERROR (((graph_t *) graph)->error, GST_PARSE_ERROR_NO_SUCH_ELEMENT, _("no element \"%s\""), $1);
                                                gst_parse_strfree ($1);
                                                if (!$$)
                                                  YYERROR;
@@ -607,7 +637,7 @@ link:               linkpart LINK linkpart        { $$ = $1;
                                                if ($2) {
                                                  $$->caps = gst_caps_from_string ($2);
                                                  if (!$$->caps)
-                                                   ERROR (GST_PARSE_ERROR_LINK, _("could not parse caps \"%s\""), $2);
+                                                   SET_ERROR (((graph_t *) graph)->error, GST_PARSE_ERROR_LINK, _("could not parse caps \"%s\""), $2);
                                                  gst_parse_strfree ($2);
                                                }
                                                $$->sink_name = $3->src_name;
@@ -629,13 +659,13 @@ chain:    element                       { $$ = gst_parse_chain_new ();
        |       bin                           { $$ = $1; }
        |       chain chain                   { if ($1->back && $2->front) {
                                                  if (!$1->back->sink_name) {
-                                                   ERROR (GST_PARSE_ERROR_LINK, _("link without source element"));
+                                                   SET_ERROR (((graph_t *) graph)->error, GST_PARSE_ERROR_LINK, _("link without source element"));
                                                    gst_parse_free_link ($1->back);
                                                  } else {
                                                    ((graph_t *) graph)->links = g_slist_prepend (((graph_t *) graph)->links, $1->back);
                                                  }
                                                  if (!$2->front->src_name) {
-                                                   ERROR (GST_PARSE_ERROR_LINK, _("link without sink element"));
+                                                   SET_ERROR (((graph_t *) graph)->error, GST_PARSE_ERROR_LINK, _("link without sink element"));
                                                    gst_parse_free_link ($2->front);
                                                  } else {
                                                    ((graph_t *) graph)->links = g_slist_prepend (((graph_t *) graph)->links, $2->front);
@@ -679,10 +709,10 @@ chain:    element                       { $$ = gst_parse_chain_new ();
                                                for (walk = $2; walk; walk = walk->next) {
                                                  link_t *link = (link_t *) walk->data;
                                                  if (!link->sink_name && walk->next) {
-                                                   ERROR (GST_PARSE_ERROR_LINK, _("link without sink element"));
+                                                   SET_ERROR (((graph_t *) graph)->error, GST_PARSE_ERROR_LINK, _("link without sink element"));
                                                    gst_parse_free_link (link);
                                                  } else if (!link->src_name && !link->src) {
-                                                   ERROR (GST_PARSE_ERROR_LINK, _("link without source element"));
+                                                   SET_ERROR (((graph_t *) graph)->error, GST_PARSE_ERROR_LINK, _("link without source element"));
                                                    gst_parse_free_link (link);
                                                  } else {
                                                    if (walk->next) {
@@ -698,7 +728,7 @@ chain:      element                       { $$ = gst_parse_chain_new ();
        |       chain error                   { $$ = $1; }
        |       link chain                    { if ($2->front) {
                                                  if (!$2->front->src_name) {
-                                                   ERROR (GST_PARSE_ERROR_LINK, _("link without source element"));
+                                                   SET_ERROR (((graph_t *) graph)->error, GST_PARSE_ERROR_LINK, _("link without source element"));
                                                    gst_parse_free_link ($2->front);
                                                  } else {
                                                    ((graph_t *) graph)->links = g_slist_prepend (((graph_t *) graph)->links, $2->front);
@@ -715,7 +745,7 @@ chain:      element                       { $$ = gst_parse_chain_new ();
                                                  GstElement *element = 
                                                          gst_element_make_from_uri (GST_URI_SRC, $1, NULL);
                                                  if (!element) {
-                                                   ERROR (GST_PARSE_ERROR_NO_SUCH_ELEMENT, 
+                                                   SET_ERROR (((graph_t *) graph)->error, GST_PARSE_ERROR_NO_SUCH_ELEMENT, 
                                                            _("no source element for URI \"%s\""), $1);
                                                  } else {
                                                    $$->front->src = element;
@@ -725,7 +755,7 @@ chain:      element                       { $$ = gst_parse_chain_new ();
                                                    $$->elements = g_slist_prepend ($$->elements, element);
                                                  }
                                                } else {
-                                                 ERROR (GST_PARSE_ERROR_LINK, 
+                                                 SET_ERROR (((graph_t *) graph)->error, GST_PARSE_ERROR_LINK, 
                                                          _("no element to link URI \"%s\" to"), $1);
                                                }
                                                g_free ($1);
@@ -733,11 +763,11 @@ chain:    element                       { $$ = gst_parse_chain_new ();
        |       link PARSE_URL                { GstElement *element =
                                                          gst_element_make_from_uri (GST_URI_SINK, $2, NULL);
                                                if (!element) {
-                                                 ERROR (GST_PARSE_ERROR_NO_SUCH_ELEMENT, 
+                                                 SET_ERROR (((graph_t *) graph)->error, GST_PARSE_ERROR_NO_SUCH_ELEMENT, 
                                                          _("no sink element for URI \"%s\""), $2);
                                                  YYERROR;
                                                } else if ($1->sink_name || $1->sink_pads) {
-                                                 ERROR (GST_PARSE_ERROR_LINK, 
+                                                 SET_ERROR (((graph_t *) graph)->error, GST_PARSE_ERROR_LINK, 
                                                          _("could not link sink element for URI \"%s\""), $2);
                                                  YYERROR;
                                                } else {
@@ -750,13 +780,13 @@ chain:    element                       { $$ = gst_parse_chain_new ();
                                                g_free ($2);
                                              }
        ;
-graph:         /* NOP */                     { ERROR (GST_PARSE_ERROR_EMPTY, _("empty pipeline not allowed"));
+graph:         /* NOP */                     { SET_ERROR (((graph_t *) graph)->error, GST_PARSE_ERROR_EMPTY, _("empty pipeline not allowed"));
                                                $$ = (graph_t *) graph;
                                              }
        |       chain                         { $$ = (graph_t *) graph;
                                                if ($1->front) {
                                                  if (!$1->front->src_name) {
-                                                   ERROR (GST_PARSE_ERROR_LINK, _("link without source element"));
+                                                   SET_ERROR (((graph_t *) graph)->error, GST_PARSE_ERROR_LINK, _("link without source element"));
                                                    gst_parse_free_link ($1->front);
                                                  } else {
                                                    $$->links = g_slist_prepend ($$->links, $1->front);
@@ -765,7 +795,7 @@ graph:              /* NOP */                     { ERROR (GST_PARSE_ERROR_EMPTY, _("empty pipeline not a
                                                }
                                                if ($1->back) {
                                                  if (!$1->back->sink_name) {
-                                                   ERROR (GST_PARSE_ERROR_LINK, _("link without sink element"));
+                                                   SET_ERROR (((graph_t *) graph)->error, GST_PARSE_ERROR_LINK, _("link without sink element"));
                                                    gst_parse_free_link ($1->back);
                                                  } else {
                                                    $$->links = g_slist_prepend ($$->links, $1->back);
@@ -793,7 +823,8 @@ yyerror (const char *s)
   return -1;
 }
 
-int _gst_parse_yy_scan_string (char*);
+struct yy_buffer_state * _gst_parse_yy_scan_string (char*);
+void _gst_parse_yy_delete_buffer (struct yy_buffer_state *);
 GstElement *
 _gst_parse_launch (const gchar *str, GError **error)
 {
@@ -802,6 +833,7 @@ _gst_parse_launch (const gchar *str, GError **error)
   GSList *walk;
   GstBin *bin = NULL;
   GstElement *ret;
+  struct yy_buffer_state *buf;
   
   g_return_val_if_fail (str != NULL, NULL);
 
@@ -815,18 +847,19 @@ _gst_parse_launch (const gchar *str, GError **error)
 #endif /* __GST_PARSE_TRACE */
 
   dstr = g_strdup (str);
-  _gst_parse_yy_scan_string (dstr);
+  buf = _gst_parse_yy_scan_string (dstr);
 
 #ifndef GST_DISABLE_GST_DEBUG
   yydebug = 1;
 #endif
 
   if (yyparse (&g) != 0) {
-    SET_ERROR (error, GST_PARSE_ERROR_SYNTAX, "Unrecoverable syntax error while parsing pipeline");
+    SET_ERROR (error, GST_PARSE_ERROR_SYNTAX, "Unrecoverable syntax error while parsing pipeline %s", str);
     
     goto error1;
   }
   g_free (dstr);
+  _gst_parse_yy_delete_buffer (buf);
   
   GST_CAT_DEBUG (GST_CAT_PIPELINE, "got %u elements and %u links", g.chain ? g_slist_length (g.chain->elements) : 0, g_slist_length (g.links));
   
@@ -909,7 +942,8 @@ error1:
   g_slist_foreach (g.links, (GFunc)gst_parse_free_link, NULL);
   g_slist_free (g.links);
   
-  g_assert (*error);
+  if (error)
+    g_assert (*error);
   ret = NULL;
   
   goto out;