[Scummvm-git-logs] scummvm master -> d84c7e9f4bf2f73dfb4ee34ec1b3cda0cf63e81e

[sev-]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
07e5734759 DIRECTOR: Made director-grammar target brew-only
d84c7e9f4b DIRECTOR: LINGO: Made bison error output verbose


Commit: 07e57347599442a5b59d22ccc91fea97c91ded31
    https://github.com/scummvm/scummvm/commit/07e57347599442a5b59d22ccc91fea97c91ded31
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-04-07T19:30:38+02:00

Commit Message:
DIRECTOR: Made director-grammar target brew-only

Changed paths:
    engines/director/module.mk


diff --git a/engines/director/module.mk b/engines/director/module.mk
index f0e247db81..0c8c96dd74 100644
--- a/engines/director/module.mk
+++ b/engines/director/module.mk
@@ -32,7 +32,7 @@ MODULE_OBJS = \
 
 director-grammar:
 	flex engines/director/lingo/lingo-lex.l
-	bison -dv engines/director/lingo/lingo-gr.y
+	`brew --prefix bison`/bin/bison -dv engines/director/lingo/lingo-gr.y
 
 # This module can be built as a plugin
 ifeq ($(ENABLE_DIRECTOR), DYNAMIC_PLUGIN)


Commit: d84c7e9f4bf2f73dfb4ee34ec1b3cda0cf63e81e
    https://github.com/scummvm/scummvm/commit/d84c7e9f4bf2f73dfb4ee34ec1b3cda0cf63e81e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-04-07T19:32:01+02:00

Commit Message:
DIRECTOR: LINGO: Made bison error output verbose

Changed paths:
    engines/director/lingo/lingo-gr.cpp
    engines/director/lingo/lingo-gr.h
    engines/director/lingo/lingo-gr.y


diff --git a/engines/director/lingo/lingo-gr.cpp b/engines/director/lingo/lingo-gr.cpp
index f3732b1b2b..1b1e1a6bf9 100644
--- a/engines/director/lingo/lingo-gr.cpp
+++ b/engines/director/lingo/lingo-gr.cpp
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 3.5.3.  */
+/* A Bison parser, made by GNU Bison 3.5.4.  */
 
 /* Bison implementation for Yacc-like parsers in C
 
@@ -48,7 +48,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "3.5.3"
+#define YYBISON_VERSION "3.5.4"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -125,7 +125,7 @@ void checkEnd(Common::String *token, const char *expect, bool required) {
 # undef YYERROR_VERBOSE
 # define YYERROR_VERBOSE 1
 #else
-# define YYERROR_VERBOSE 0
+# define YYERROR_VERBOSE 1
 #endif
 
 /* Use api.header.include to #include this header
@@ -661,7 +661,7 @@ static const yytype_int16 yyrline[] =
 };
 #endif
 
-#if YYDEBUG || YYERROR_VERBOSE || 0
+#if YYDEBUG || YYERROR_VERBOSE || 1
 /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
    First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
 static const char *const yytname[] =
diff --git a/engines/director/lingo/lingo-gr.h b/engines/director/lingo/lingo-gr.h
index 0c0f5bcec7..0e3cbd669f 100644
--- a/engines/director/lingo/lingo-gr.h
+++ b/engines/director/lingo/lingo-gr.h
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 3.5.3.  */
+/* A Bison parser, made by GNU Bison 3.5.4.  */
 
 /* Bison interface for Yacc-like parsers in C
 
diff --git a/engines/director/lingo/lingo-gr.y b/engines/director/lingo/lingo-gr.y
index dd14c2c6ae..d8e63e9f78 100644
--- a/engines/director/lingo/lingo-gr.y
+++ b/engines/director/lingo/lingo-gr.y
@@ -49,7 +49,7 @@
 %require "3.5"
 %defines "engines/director/lingo/lingo-gr.h"
 %output "engines/director/lingo/lingo-gr.cpp"
-
+%define parse.error verbose
 // %glr-parser
 
 %{