[Scummvm-git-logs] scummvm master -> 22ff9c42d82fbef12fc23e3d624537ed97d0ef4f

[sev-]

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

Summary:
22ff9c42d8 DIRECTOR: LINGO: Added PARRAY Datum type and removed PCELL


Commit: 22ff9c42d82fbef12fc23e3d624537ed97d0ef4f
    https://github.com/scummvm/scummvm/commit/22ff9c42d82fbef12fc23e3d624537ed97d0ef4f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-04-18T18:51:12+02:00

Commit Message:
DIRECTOR: LINGO: Added PARRAY Datum type and removed PCELL

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 17b832a346..1f6a4a20b2 100644
--- a/engines/director/lingo/lingo-gr.cpp
+++ b/engines/director/lingo/lingo-gr.cpp
@@ -155,7 +155,7 @@ extern int yydebug;
     OBJECT = 265,
     REFERENCE = 266,
     LEXERROR = 267,
-    PCELL = 268,
+    PARRAY = 268,
     INT = 269,
     ARGC = 270,
     ARGCNORET = 271,
@@ -668,7 +668,7 @@ static const yytype_int16 yyrline[] =
 static const char *const yytname[] =
 {
   "$end", "error", "$undefined", "UNARY", "CASTREF", "VOID", "VAR",
-  "POINT", "RECT", "ARRAY", "OBJECT", "REFERENCE", "LEXERROR", "PCELL",
+  "POINT", "RECT", "ARRAY", "OBJECT", "REFERENCE", "LEXERROR", "PARRAY",
   "INT", "ARGC", "ARGCNORET", "THEENTITY", "THEENTITYWITHID",
   "THEMENUITEMENTITY", "THEMENUITEMSENTITY", "FLOAT", "BLTIN", "FBLTIN",
   "RBLTIN", "ID", "STRING", "HANDLER", "SYMBOL", "ENDCLAUSE", "tPLAYACCEL",
diff --git a/engines/director/lingo/lingo-gr.h b/engines/director/lingo/lingo-gr.h
index 3ca76a89e7..6360c9835c 100644
--- a/engines/director/lingo/lingo-gr.h
+++ b/engines/director/lingo/lingo-gr.h
@@ -59,7 +59,7 @@ extern int yydebug;
     OBJECT = 265,
     REFERENCE = 266,
     LEXERROR = 267,
-    PCELL = 268,
+    PARRAY = 268,
     INT = 269,
     ARGC = 270,
     ARGCNORET = 271,
diff --git a/engines/director/lingo/lingo-gr.y b/engines/director/lingo/lingo-gr.y
index d7d0fbe28c..5569a7052c 100644
--- a/engines/director/lingo/lingo-gr.y
+++ b/engines/director/lingo/lingo-gr.y
@@ -103,7 +103,7 @@ void checkEnd(Common::String *token, const char *expect, bool required) {
 }
 
 %token UNARY
-%token CASTREF VOID VAR POINT RECT ARRAY OBJECT REFERENCE LEXERROR PCELL
+%token CASTREF VOID VAR POINT RECT ARRAY OBJECT REFERENCE LEXERROR PARRAY
 %token<i> INT ARGC ARGCNORET
 %token<e> THEENTITY THEENTITYWITHID THEMENUITEMENTITY THEMENUITEMSENTITY
 %token<f> FLOAT