[Scummvm-git-logs] scummvm master -> 836588a00be35f921cd28fa0e4073a016c455fac

[digitall]

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:
d4f83d5017 PRIVATE: Reduce Scope of Forbidden Symbol Exceptions
836588a00b HYPNO: Reduce Scope of Forbidden Symbol Exceptions


Commit: d4f83d5017b089143f501c20c2d2962efcb104fd
    https://github.com/scummvm/scummvm/commit/d4f83d5017b089143f501c20c2d2962efcb104fd
Author: D G Turner (digitall at scummvm.org)
Date: 2023-07-24T00:47:16+01:00

Commit Message:
PRIVATE: Reduce Scope of Forbidden Symbol Exceptions

Changed paths:
    engines/private/lexer.cpp
    engines/private/lexer.l


diff --git a/engines/private/lexer.cpp b/engines/private/lexer.cpp
index b9c944f102b..08c5e9347cf 100644
--- a/engines/private/lexer.cpp
+++ b/engines/private/lexer.cpp
@@ -777,7 +777,15 @@ char *yytext;
 #define YY_NO_INPUT 1
 #line 31 "engines/private/lexer.l"
 #define YY_NO_UNISTD_H
-#define FORBIDDEN_SYMBOL_ALLOW_ALL
+#define FORBIDDEN_SYMBOL_EXCEPTION_FILE
+#define FORBIDDEN_SYMBOL_EXCEPTION_fprintf
+#define FORBIDDEN_SYMBOL_EXCEPTION_fwrite
+#define FORBIDDEN_SYMBOL_EXCEPTION_fread
+#define FORBIDDEN_SYMBOL_EXCEPTION_stdin
+#define FORBIDDEN_SYMBOL_EXCEPTION_stdout
+#define FORBIDDEN_SYMBOL_EXCEPTION_stderr
+#define FORBIDDEN_SYMBOL_EXCEPTION_exit
+#define FORBIDDEN_SYMBOL_EXCEPTION_getc
 
 #include "private/private.h"
 #include "private/grammar.h"
diff --git a/engines/private/lexer.l b/engines/private/lexer.l
index 6041a70be2e..65ed85fa433 100644
--- a/engines/private/lexer.l
+++ b/engines/private/lexer.l
@@ -28,7 +28,15 @@
 
 %{
 #define YY_NO_UNISTD_H
-#define FORBIDDEN_SYMBOL_ALLOW_ALL
+#define FORBIDDEN_SYMBOL_EXCEPTION_FILE
+#define FORBIDDEN_SYMBOL_EXCEPTION_fprintf
+#define FORBIDDEN_SYMBOL_EXCEPTION_fwrite
+#define FORBIDDEN_SYMBOL_EXCEPTION_fread
+#define FORBIDDEN_SYMBOL_EXCEPTION_stdin
+#define FORBIDDEN_SYMBOL_EXCEPTION_stdout
+#define FORBIDDEN_SYMBOL_EXCEPTION_stderr
+#define FORBIDDEN_SYMBOL_EXCEPTION_exit
+#define FORBIDDEN_SYMBOL_EXCEPTION_getc
 
 #include "private/private.h"
 #include "private/grammar.h"


Commit: 836588a00be35f921cd28fa0e4073a016c455fac
    https://github.com/scummvm/scummvm/commit/836588a00be35f921cd28fa0e4073a016c455fac
Author: D G Turner (digitall at scummvm.org)
Date: 2023-07-24T00:47:34+01:00

Commit Message:
HYPNO: Reduce Scope of Forbidden Symbol Exceptions

Changed paths:
    engines/hypno/lexer_arc.cpp
    engines/hypno/lexer_arc.l
    engines/hypno/lexer_mis.cpp
    engines/hypno/lexer_mis.l


diff --git a/engines/hypno/lexer_arc.cpp b/engines/hypno/lexer_arc.cpp
index 4b495e2621b..d6da3615c09 100644
--- a/engines/hypno/lexer_arc.cpp
+++ b/engines/hypno/lexer_arc.cpp
@@ -864,7 +864,15 @@ char *yytext;
 #define YY_NO_INPUT 1
 #line 32 "engines/hypno/lexer_arc.l"
 #define YY_NO_UNISTD_H
-#define FORBIDDEN_SYMBOL_ALLOW_ALL
+#define FORBIDDEN_SYMBOL_EXCEPTION_FILE
+#define FORBIDDEN_SYMBOL_EXCEPTION_fprintf
+#define FORBIDDEN_SYMBOL_EXCEPTION_fwrite
+#define FORBIDDEN_SYMBOL_EXCEPTION_fread
+#define FORBIDDEN_SYMBOL_EXCEPTION_stdin
+#define FORBIDDEN_SYMBOL_EXCEPTION_stdout
+#define FORBIDDEN_SYMBOL_EXCEPTION_stderr
+#define FORBIDDEN_SYMBOL_EXCEPTION_exit
+#define FORBIDDEN_SYMBOL_EXCEPTION_getc
 #define YYERROR_VERBOSE
 
 #include "hypno/hypno.h"
diff --git a/engines/hypno/lexer_arc.l b/engines/hypno/lexer_arc.l
index 06b42dfec20..fd955aa0f15 100644
--- a/engines/hypno/lexer_arc.l
+++ b/engines/hypno/lexer_arc.l
@@ -30,7 +30,15 @@
 
 %{
 #define YY_NO_UNISTD_H
-#define FORBIDDEN_SYMBOL_ALLOW_ALL
+#define FORBIDDEN_SYMBOL_EXCEPTION_FILE
+#define FORBIDDEN_SYMBOL_EXCEPTION_fprintf
+#define FORBIDDEN_SYMBOL_EXCEPTION_fwrite
+#define FORBIDDEN_SYMBOL_EXCEPTION_fread
+#define FORBIDDEN_SYMBOL_EXCEPTION_stdin
+#define FORBIDDEN_SYMBOL_EXCEPTION_stdout
+#define FORBIDDEN_SYMBOL_EXCEPTION_stderr
+#define FORBIDDEN_SYMBOL_EXCEPTION_exit
+#define FORBIDDEN_SYMBOL_EXCEPTION_getc
 #define YYERROR_VERBOSE
 
 #include "hypno/hypno.h"
diff --git a/engines/hypno/lexer_mis.cpp b/engines/hypno/lexer_mis.cpp
index 2975acffbe1..f5b2dd1c9ce 100644
--- a/engines/hypno/lexer_mis.cpp
+++ b/engines/hypno/lexer_mis.cpp
@@ -895,7 +895,15 @@ char *yytext;
 #define YY_NO_INPUT 1
 #line 32 "engines/hypno/lexer_mis.l"
 #define YY_NO_UNISTD_H
-#define FORBIDDEN_SYMBOL_ALLOW_ALL
+#define FORBIDDEN_SYMBOL_EXCEPTION_FILE
+#define FORBIDDEN_SYMBOL_EXCEPTION_fprintf
+#define FORBIDDEN_SYMBOL_EXCEPTION_fwrite
+#define FORBIDDEN_SYMBOL_EXCEPTION_fread
+#define FORBIDDEN_SYMBOL_EXCEPTION_stdin
+#define FORBIDDEN_SYMBOL_EXCEPTION_stdout
+#define FORBIDDEN_SYMBOL_EXCEPTION_stderr
+#define FORBIDDEN_SYMBOL_EXCEPTION_exit
+#define FORBIDDEN_SYMBOL_EXCEPTION_getc
 
 #include "hypno/hypno.h"
 #include "hypno/grammar.h"
diff --git a/engines/hypno/lexer_mis.l b/engines/hypno/lexer_mis.l
index 9bfcd028764..c6165d46e85 100644
--- a/engines/hypno/lexer_mis.l
+++ b/engines/hypno/lexer_mis.l
@@ -30,7 +30,15 @@
 
 %{
 #define YY_NO_UNISTD_H
-#define FORBIDDEN_SYMBOL_ALLOW_ALL
+#define FORBIDDEN_SYMBOL_EXCEPTION_FILE
+#define FORBIDDEN_SYMBOL_EXCEPTION_fprintf
+#define FORBIDDEN_SYMBOL_EXCEPTION_fwrite
+#define FORBIDDEN_SYMBOL_EXCEPTION_fread
+#define FORBIDDEN_SYMBOL_EXCEPTION_stdin
+#define FORBIDDEN_SYMBOL_EXCEPTION_stdout
+#define FORBIDDEN_SYMBOL_EXCEPTION_stderr
+#define FORBIDDEN_SYMBOL_EXCEPTION_exit
+#define FORBIDDEN_SYMBOL_EXCEPTION_getc
 
 #include "hypno/hypno.h"
 #include "hypno/grammar.h"