From 51ffdb1f04f5e8b0fb539b5ac82a00b05ac11890 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20H=C3=BCbinette=20=28Hubbe=29?= <hubbe@hubbe.net>
Date: Mon, 19 Jan 1998 18:30:39 -0800
Subject: [PATCH] fixed so that anonymous classes work again
Rev: src/compilation.h:1.5
Rev: src/language.yacc:1.53
Rev: src/program.c:1.52
Rev: src/program.h:1.25
Rev: src/testsuite.in:1.67
---
src/compilation.h | 1 +
src/language.yacc | 13 ++++++++++---
src/program.c | 3 ++-
src/program.h | 1 +
src/testsuite.in | 6 ++++--
5 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/src/compilation.h b/src/compilation.h
index 4be9a7a690..e64f1c71fe 100644
--- a/src/compilation.h
+++ b/src/compilation.h
@@ -86,6 +86,7 @@
ZMEMBER(dynamic_buffer,used_modules)
IMEMBER(int,comp_stackp)
IMEMBER(int,compiler_pass)
+ ZMEMBER(int,local_class_counter)
SEND
#undef PCODE
diff --git a/src/language.yacc b/src/language.yacc
index 7f4398535b..1e858ae3c0 100644
--- a/src/language.yacc
+++ b/src/language.yacc
@@ -162,7 +162,7 @@
/* This is the grammar definition of Pike. */
#include "global.h"
-RCSID("$Id: language.yacc,v 1.52 1998/01/19 18:38:45 hubbe Exp $");
+RCSID("$Id: language.yacc,v 1.53 1998/01/20 02:30:35 hubbe Exp $");
#ifdef HAVE_MEMORY_H
#include <memory.h>
#endif
@@ -921,7 +921,7 @@ lambda: F_LAMBDA
f=dooptcode(name,
mknode(F_ARG_LIST,$4,mknode(F_RETURN,mkintnode(0),0)),
type,
- 0);
+ ID_PRIVATE);
}
free_string(name);
free_string(type);
@@ -935,8 +935,15 @@ failsafe_program: '{' program '}'
| error { yyerrok; }
;
-class: modifiers F_CLASS F_IDENTIFIER
+class: modifiers F_CLASS optional_identifier
{
+ if(!$3)
+ {
+ char buffer[42];
+ sprintf(buffer,"__class_%ld",local_class_counter++);
+ $3=make_shared_string(buffer);
+ $1|=ID_PRIVATE;
+ }
if(compiler_pass==1)
{
low_start_new_program(0, $3, $1);
diff --git a/src/program.c b/src/program.c
index a4d2602fe6..e2f71b8aa6 100644
--- a/src/program.c
+++ b/src/program.c
@@ -4,7 +4,7 @@
||| See the files COPYING and DISCLAIMER for more information.
\*/
#include "global.h"
-RCSID("$Id: program.c,v 1.51 1998/01/20 00:43:14 hubbe Exp $");
+RCSID("$Id: program.c,v 1.52 1998/01/20 02:30:38 hubbe Exp $");
#include "program.h"
#include "object.h"
#include "dynamic_buffer.h"
@@ -95,6 +95,7 @@ struct program *malloc_size_program=0;
int compiler_pass;
int compilation_depth;
+int local_class_counter;
struct compiler_frame *compiler_frame=0;
static INT32 last_line = 0;
static INT32 last_pc = 0;
diff --git a/src/program.h b/src/program.h
index 209efcdcd0..6399d35819 100644
--- a/src/program.h
+++ b/src/program.h
@@ -218,6 +218,7 @@ extern struct object fake_object;
extern struct program *new_program;
extern struct program *first_program;
extern int compiler_pass;
+extern int local_class_counter;
#define FOO(NUMTYPE,TYPE,NAME) void PIKE_CONCAT(add_to_,NAME(TYPE ARG));
#include "program_areas.h"
diff --git a/src/testsuite.in b/src/testsuite.in
index f7e4e3bc6b..444c296361 100644
--- a/src/testsuite.in
+++ b/src/testsuite.in
@@ -1,4 +1,4 @@
-test_true([["$Id: testsuite.in,v 1.66 1998/01/17 01:06:48 hubbe Exp $"]])
+test_true([["$Id: testsuite.in,v 1.67 1998/01/20 02:30:39 hubbe Exp $"]])
test_eq(1e1,10.0)
test_eq(1E1,10.0)
test_eq(1e+1,10.0)
@@ -10,6 +10,8 @@ test_eq([[cpp("#define FOO(X,Y) (X) (Y)\nFOO( (A),(B) )")]],"# 1 \"-\"\n\n( (A)
test_eq([[cpp("#define F 'F'\nF")]],"# 1 \"-\"\n\n'F'")
test_eq([[cpp("#define MAX(X,Y) ((X)>(Y)?(X):(Y))\n#define MAX3(X,Y,Z) MAX(MAX(X,Y),Z)\nMAX3(1,2,3)")]],"# 1 \"-\"\n\n\n(( (( 1 )>( 2 )?( 1 ):( 2 )) )>( 3 )?( (( 1 )>( 2 )?( 1 ):( 2 )) ):( 3 ))")
+test_program([[class foo { program x() { return class {}; }}; class bar { inherit foo; program x() { return class {}; }} int a() { return foo()->x != bar()->x(); }]])
+
test_any([[object o=class foo{int c;class bar{void create(){c++;};}}(); o->bar(); return o->c;]],1)
test_do([[add_constant("GURKA2",class foo { int c; class bar{void create() {c+=17;}}}()); ]])
test_any([[class x { inherit GURKA2.bar; }(); return GURKA2->c;]],17)
@@ -20,7 +22,7 @@ test_any([[class x { inherit GURKA2.bar; }(); return GURKA2->c;]],17)
test_any([[class x { inherit GURKA2.bar; }(); return GURKA2->c;]],34)
test_do([[add_constant("GURKA2");]]);
-test_eq(class c { static int foo=17; }()->foo,0)
+test_eq(class { static int foo=17; }()->foo,0)
test_eval_error(class c { static int foo=17; }()->foo=18;)
test_equal( [[ ({ (["foo":"bar"]), (<"foo">), ([]) })->foo ]], [[ ({"bar",1,0}) ]])
test_any([[mixed a=({([]),0}); a[1]=a; return a->foo[0];]],0)
--
GitLab