Skip to content

Commit

Permalink
DIRECTOR: Lingo: Updated copyright and added 'macro' keyword document…
Browse files Browse the repository at this point in the history 
…ation
  • Loading branch information
@sev-
sev- committed Aug 3, 2016
1 parent cd7a6ab commit bdbb558
Show file tree
Hide file tree
Showing 4 changed files with 112 additions and 39 deletions.
23 changes: 23 additions & 0 deletions engines/director/lingo/lingo-funcs.cpp
View file
Expand Up @@ -20,6 +20,29 @@
*
*/

// Heavily inspired by hoc
// Copyright (C) AT&T 1995
// All Rights Reserved
//
// Permission to use, copy, modify, and distribute this software and
// its documentation for any purpose and without fee is hereby
// granted, provided that the above copyright notice appear in all
// copies and that both that the copyright notice and this
// permission notice and warranty disclaimer appear in supporting
// documentation, and that the name of AT&T or any of its entities
// not be used in advertising or publicity pertaining to
// distribution of the software without specific, written prior
// permission.
//
// AT&T DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
// INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
// IN NO EVENT SHALL AT&T OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
// SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
// IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
// ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
// THIS SOFTWARE.

#include "engines/director/lingo/lingo.h"
#include "common/file.h"
#include "audio/decoders/wave.h"
Expand Down
76 changes: 38 additions & 38 deletions engines/director/lingo/lingo-gr.cpp
View file
Expand Up @@ -112,7 +112,7 @@


/* Copy the first part of user declarations. */
#line 25 "engines/director/lingo/lingo-gr.y"
#line 49 "engines/director/lingo/lingo-gr.y"

#define FORBIDDEN_SYMBOL_ALLOW_ALL

Expand Down Expand Up @@ -149,7 +149,7 @@ using namespace Director;

#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE
#line 41 "engines/director/lingo/lingo-gr.y"
#line 65 "engines/director/lingo/lingo-gr.y"
{
Common::String *s;
int i;
Expand Down Expand Up @@ -467,10 +467,10 @@ static const yytype_int8 yyrhs[] =
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
static const yytype_uint8 yyrline[] =
{
0, 64, 64, 65, 68, 69, 70, 71, 72, 73,
74, 77, 78, 79, 82, 85, 86, 87, 88, 89,
90, 91, 92, 93, 96, 97, 98, 109, 110, 111,
112, 113, 114, 117, 118, 119, 120, 123, 124, 125
0, 88, 88, 89, 92, 93, 94, 95, 96, 97,
98, 101, 102, 103, 106, 109, 110, 111, 112, 113,
114, 115, 116, 117, 120, 121, 122, 133, 134, 135,
136, 137, 138, 141, 142, 143, 144, 147, 148, 149
};
#endif

Expand Down Expand Up @@ -1412,157 +1412,157 @@ yyparse ()
switch (yyn)
{
case 6:
#line 70 "engines/director/lingo/lingo-gr.y"
#line 94 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->func_xpop); ;}
break;

case 8:
#line 72 "engines/director/lingo/lingo-gr.y"
#line 96 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->func_printtop); ;}
break;

case 9:
#line 73 "engines/director/lingo/lingo-gr.y"
#line 97 "engines/director/lingo/lingo-gr.y"
{ yyerrok; ;}
break;

case 11:
#line 77 "engines/director/lingo/lingo-gr.y"
#line 101 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->func_varpush); g_lingo->codeString((yyvsp[(4) - (4)].s)->c_str()); g_lingo->code1(g_lingo->func_assign); (yyval.code) = (yyvsp[(2) - (4)].code); delete (yyvsp[(4) - (4)].s); ;}
break;

case 12:
#line 78 "engines/director/lingo/lingo-gr.y"
#line 102 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->func_varpush); g_lingo->codeString((yyvsp[(2) - (4)].s)->c_str()); g_lingo->code1(g_lingo->func_assign); (yyval.code) = (yyvsp[(4) - (4)].code); delete (yyvsp[(2) - (4)].s); ;}
break;

case 13:
#line 79 "engines/director/lingo/lingo-gr.y"
#line 103 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->func_varpush); g_lingo->codeString((yyvsp[(2) - (4)].s)->c_str()); g_lingo->code1(g_lingo->func_assign); (yyval.code) = (yyvsp[(4) - (4)].code); delete (yyvsp[(2) - (4)].s); ;}
break;

case 14:
#line 82 "engines/director/lingo/lingo-gr.y"
#line 106 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->func_xpop); ;}
break;

case 15:
#line 85 "engines/director/lingo/lingo-gr.y"
#line 109 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->func_constpush); inst i; WRITE_LE_UINT32(&i, (yyvsp[(1) - (1)].i)); (yyval.code) = g_lingo->code1(i); ;}
break;

case 16:
#line 86 "engines/director/lingo/lingo-gr.y"
#line 110 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->func_varpush); g_lingo->codeString((yyvsp[(1) - (1)].s)->c_str()); (yyval.code) = g_lingo->code1(g_lingo->func_eval); delete (yyvsp[(1) - (1)].s); ;}
break;

case 17:
#line 87 "engines/director/lingo/lingo-gr.y"
#line 111 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->func_add); ;}
break;

case 18:
#line 88 "engines/director/lingo/lingo-gr.y"
#line 112 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->func_sub); ;}
break;

case 19:
#line 89 "engines/director/lingo/lingo-gr.y"
#line 113 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->func_mul); ;}
break;

case 20:
#line 90 "engines/director/lingo/lingo-gr.y"
#line 114 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->func_div); ;}
break;

case 21:
#line 91 "engines/director/lingo/lingo-gr.y"
#line 115 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = (yyvsp[(2) - (2)].code); ;}
break;

case 22:
#line 92 "engines/director/lingo/lingo-gr.y"
#line 116 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = (yyvsp[(2) - (2)].code); g_lingo->code1(g_lingo->func_negate); ;}
break;

case 23:
#line 93 "engines/director/lingo/lingo-gr.y"
#line 117 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = (yyvsp[(2) - (3)].code); ;}
break;

case 24:
#line 96 "engines/director/lingo/lingo-gr.y"
#line 120 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->func_mci); g_lingo->codeString((yyvsp[(2) - (2)].s)->c_str()); delete (yyvsp[(2) - (2)].s); ;}
break;

case 25:
#line 97 "engines/director/lingo/lingo-gr.y"
#line 121 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->func_mciwait); g_lingo->codeString((yyvsp[(2) - (2)].s)->c_str()); delete (yyvsp[(2) - (2)].s); ;}
break;

case 27:
#line 109 "engines/director/lingo/lingo-gr.y"
#line 133 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->func_gotoloop); ;}
break;

case 28:
#line 110 "engines/director/lingo/lingo-gr.y"
#line 134 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->func_gotonext); ;}
break;

case 29:
#line 111 "engines/director/lingo/lingo-gr.y"
#line 135 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->func_gotoprevious); ;}
break;

case 30:
#line 112 "engines/director/lingo/lingo-gr.y"
#line 136 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->func_goto); g_lingo->codeString((yyvsp[(2) - (2)].s)->c_str()); g_lingo->codeString(""); delete (yyvsp[(2) - (2)].s); ;}
break;

case 31:
#line 113 "engines/director/lingo/lingo-gr.y"
#line 137 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->func_goto); g_lingo->codeString((yyvsp[(2) - (3)].s)->c_str()); g_lingo->codeString((yyvsp[(3) - (3)].s)->c_str()); delete (yyvsp[(2) - (3)].s); delete (yyvsp[(3) - (3)].s); ;}
break;

case 32:
#line 114 "engines/director/lingo/lingo-gr.y"
#line 138 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->func_goto); g_lingo->codeString(""); g_lingo->codeString((yyvsp[(2) - (2)].s)->c_str()); delete (yyvsp[(2) - (2)].s); ;}
break;

case 33:
#line 117 "engines/director/lingo/lingo-gr.y"
#line 141 "engines/director/lingo/lingo-gr.y"
{ (yyval.s) = (yyvsp[(3) - (3)].s); ;}
break;

case 34:
#line 118 "engines/director/lingo/lingo-gr.y"
#line 142 "engines/director/lingo/lingo-gr.y"
{ (yyval.s) = (yyvsp[(2) - (2)].s); ;}
break;

case 35:
#line 119 "engines/director/lingo/lingo-gr.y"
#line 143 "engines/director/lingo/lingo-gr.y"
{ (yyval.s) = (yyvsp[(2) - (2)].s); ;}
break;

case 36:
#line 120 "engines/director/lingo/lingo-gr.y"
#line 144 "engines/director/lingo/lingo-gr.y"
{ (yyval.s) = (yyvsp[(1) - (1)].s); ;}
break;

case 37:
#line 123 "engines/director/lingo/lingo-gr.y"
#line 147 "engines/director/lingo/lingo-gr.y"
{ (yyval.s) = (yyvsp[(3) - (3)].s); ;}
break;

case 38:
#line 124 "engines/director/lingo/lingo-gr.y"
#line 148 "engines/director/lingo/lingo-gr.y"
{ (yyval.s) = (yyvsp[(2) - (2)].s); ;}
break;

case 39:
#line 125 "engines/director/lingo/lingo-gr.y"
#line 149 "engines/director/lingo/lingo-gr.y"
{ (yyval.s) = (yyvsp[(3) - (3)].s); ;}
break;

Expand Down Expand Up @@ -1782,6 +1782,6 @@ yyparse ()
}


#line 129 "engines/director/lingo/lingo-gr.y"
#line 179 "engines/director/lingo/lingo-gr.y"


2 changes: 1 addition & 1 deletion engines/director/lingo/lingo-gr.h
View file
Expand Up @@ -86,7 +86,7 @@

#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE
#line 41 "engines/director/lingo/lingo-gr.y"
#line 65 "engines/director/lingo/lingo-gr.y"
{
Common::String *s;
int i;
Expand Down
50 changes: 50 additions & 0 deletions engines/director/lingo/lingo-gr.y
View file
Expand Up @@ -20,6 +20,30 @@
*
*/

// Heavily inspired by hoc
// Copyright (C) AT&T 1995
// All Rights Reserved
//
// Permission to use, copy, modify, and distribute this software and
// its documentation for any purpose and without fee is hereby
// granted, provided that the above copyright notice appear in all
// copies and that both that the copyright notice and this
// permission notice and warranty disclaimer appear in supporting
// documentation, and that the name of AT&T or any of its entities
// not be used in advertising or publicity pertaining to
// distribution of the software without specific, written prior
// permission.
//
// AT&T DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
// INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
// IN NO EVENT SHALL AT&T OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
// SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
// IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
// ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
// THIS SOFTWARE.


%debug

%{
Expand Down Expand Up @@ -125,5 +149,31 @@ gotomovie: tOF tMOVIE STRING { $$ = $3; }
| tTO tMOVIE STRING { $$ = $3; }
;

// macro
//
// Special Note The macro keyword is retained in Director 3.0 to maintain compatibility
// with scripts developed under Version 2.0. When writing new scripts, or editing old
// scripts, you should use handlers instead of macros. (Handlers are defined with the on keyword.)
//
// Syntax:
//
// -- [comment]
// macro macroName [argument1] [, argument2]
// [, argument3]
// [statement1]
// [statement2]
//
// Keyword. Defines a macro. A macro is a multiple-line script defined
// in the Text window. Macros can accept arguments (inputs) and
// optionally return a result. Macros can call other macros and can be
// called from any other script or factory.
//
// The first line of a castmember in the Text window that contains a macro must be
// a comment (--). You can define more than one macro in a given text castmember.
// The macro definition ends where the next macro (or factory) begins.
//
// See also:
// on keyword


%%

0 comments on commit bdbb558

Please sign in to comment.