[gnome-builder/wip/chergert/razzledazzle: 9/20] tmpl: update tmpl snapshot



commit 4597551054e6d07bb7c8e798fc4fca593484dd31
Author: Christian Hergert <chergert redhat com>
Date:   Fri Jun 2 16:15:54 2017 -0700

    tmpl: update tmpl snapshot

 contrib/tmpl/tmpl-expr-parser.y      |    3 +++
 contrib/tmpl/tmpl-expr-scanner.l     |    1 +
 contrib/tmpl/tmpl-template-locator.c |    2 +-
 3 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/contrib/tmpl/tmpl-expr-parser.y b/contrib/tmpl/tmpl-expr-parser.y
index 8f44e69..e305dda 100644
--- a/contrib/tmpl/tmpl-expr-parser.y
+++ b/contrib/tmpl/tmpl-expr-parser.y
@@ -175,6 +175,9 @@ exp: exp CMP exp {
   | NAME '(' ')' {
     $$ = tmpl_expr_new_user_fn_call ($1, NULL);
   }
+  | '!' exp {
+    $$ = tmpl_expr_new_invert_boolean ($2);
+  }
   | REQUIRE NAME {
     $$ = tmpl_expr_new_require ($2, NULL);
   }
diff --git a/contrib/tmpl/tmpl-expr-scanner.l b/contrib/tmpl/tmpl-expr-scanner.l
index afe2435..48a3f4d 100644
--- a/contrib/tmpl/tmpl-expr-scanner.l
+++ b/contrib/tmpl/tmpl-expr-scanner.l
@@ -38,6 +38,7 @@ TmplExprParser *parser = yyextra;
 "," |
 "." |
 ";" |
+"!" |
 "(" |
 ")" { return yytext [0]; }
 
diff --git a/contrib/tmpl/tmpl-template-locator.c b/contrib/tmpl/tmpl-template-locator.c
index db49fc2..8fc6b5a 100644
--- a/contrib/tmpl/tmpl-template-locator.c
+++ b/contrib/tmpl/tmpl-template-locator.c
@@ -102,7 +102,7 @@ tmpl_template_locator_real_locate (TmplTemplateLocator  *self,
       g_set_error (error,
                    TMPL_ERROR,
                    TMPL_ERROR_TEMPLATE_NOT_FOUND,
-                   _("Failed to locate template ā€œ%sā€"),
+                   _("Failed to locate template \"%s\""),
                    path);
       return NULL;
     }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]