diff --git a/src/compilation.h b/src/compilation.h
index 51cd82409547567fcd6485caa24722d8474979e8..6c614ed7fecbf76ff2adc8dc149654a8f480b07b 100644
--- a/src/compilation.h
+++ b/src/compilation.h
@@ -75,18 +75,6 @@
ZMEMBER(struct pike_string *,X)
#endif
-#ifdef FILE_STATE
- SNAME(file_state,previous_file_state)
- ZMEMBER(INT32,old_line)
- ZMEMBER(INT32,current_line)
- ZMEMBER(INT32,nexpands)
- ZMEMBER(int,pragma_all_inline)
- ZMEMBER(struct inputstate *,istate)
- ZMEMBER(struct hash_table *,defines)
- STRMEMBER(current_file,"current_file")
- SEND
-#endif
-
#ifdef PROGRAM_STATE
SNAME(program_state,previous_program_state)
ZMEMBER(INT32,last_line)
@@ -97,11 +85,26 @@
ZMEMBER(int,num_parse_error)
ZMEMBER(struct locals *,local_variables)
ZMEMBER(dynamic_buffer,inherit_names)
+ ZMEMBER(dynamic_buffer,used_modules)
ZMEMBER2(dynamic_buffer,areas,[NUM_AREAS])
IMEMBER(int,comp_stackp)
SEND
#endif
+#ifdef FILE_STATE
+ SNAME(file_state,previous_file_state)
+ ZMEMBER(INT32,old_line)
+ ZMEMBER(INT32,current_line)
+ ZMEMBER(INT32,nexpands)
+ ZMEMBER(int,pragma_all_inline)
+ ZMEMBER(struct inputstate *,istate)
+ ZMEMBER(struct hash_table *,defines)
+ ZMEMBER(struct program_state *,previous_program_state)
+ STRMEMBER(current_file,"current_file")
+ SEND
+#endif
+
+
#undef PCODE
#undef STRMEMBER
#undef IMEMBER
diff --git a/src/las.c b/src/las.c
index 49a8ab05f381f3f9fc5c76c7de9d625d46097c6b..1fa17efff8171f9e15b32b9931b7bec783cd6ffc 100644
--- a/src/las.c
+++ b/src/las.c
@@ -4,7 +4,7 @@
||| See the files COPYING and DISCLAIMER for more information.
\*/
#include "global.h"
-RCSID("$Id: las.c,v 1.12 1997/01/19 09:08:00 hubbe Exp $");
+RCSID("$Id: las.c,v 1.13 1997/01/22 05:19:45 hubbe Exp $");
#include "language.h"
#include "interpret.h"
@@ -1138,40 +1138,56 @@ void fix_type_field(node *n)
break;
case F_INDEX:
+ type_a=CAR(n)->type;
+ type_b=CDR(n)->type;
+ if(!check_indexing(type_a, type_b, n))
+ my_yyerror("Indexing on illegal type.");
+ n->type=index_type(type_a,n);
+ break;
+
case F_ARROW:
type_a=CAR(n)->type;
type_b=CDR(n)->type;
- if(!check_indexing(type_a, type_b))
+ if(!check_indexing(type_a, type_b, n))
my_yyerror("Indexing on illegal type.");
- n->type=index_type(type_a);
+ n->type=index_type(type_a,n);
break;
case F_APPLY:
{
struct pike_string *s;
+ struct pike_string *f;
push_type(T_MIXED); /* match any return type, even void */
push_type(T_VOID); /* not varargs */
push_type(T_MANY);
low_build_function_type(CDR(n));
push_type(T_FUNCTION);
s=pop_type();
-
- n->type=check_call(s,CAR(n)->type?CAR(n)->type:mixed_type_string);
+ f=CAR(n)->type?CAR(n)->type:mixed_type_string;
+ n->type=check_call(s,f);
if(!n->type)
{
+ char *name;
+ int args;
switch(CAR(n)->token)
{
case F_IDENTIFIER:
setup_fake_program();
- my_yyerror("Bad argument %d to '%s'.",
- max_correct_args+1,
- ID_FROM_INT(& fake_program, CAR(n)->u.number)->name->str);
+ name=ID_FROM_INT(&fake_program, CAR(n)->u.number)->name->str;
break;
-
+
case F_CONSTANT:
default:
- my_yyerror("Bad argument %d to function call.",max_correct_args+1);
+ name="function call";
+ }
+
+ if(max_correct_args == count_arguments(s))
+ {
+ my_yyerror("To few arguments to %s.\n",name);
+ }else{
+ my_yyerror("Bad argument %d to %s.",
+ max_correct_args+1, name);
}
copy_shared_string(n->type, mixed_type_string);
}
diff --git a/src/pike_types.c b/src/pike_types.c
index a2450b2e9793f96e20ff3bb2fb8257a16cb5f76c..4d2f950a186b86d577bf495ed2ea71e3a541643d 100644
--- a/src/pike_types.c
+++ b/src/pike_types.c
@@ -4,7 +4,7 @@
||| See the files COPYING and DISCLAIMER for more information.
\*/
#include "global.h"
-RCSID("$Id: pike_types.c,v 1.12 1997/01/04 05:09:25 hubbe Exp $");
+RCSID("$Id: pike_types.c,v 1.13 1997/01/22 05:19:45 hubbe Exp $");
#include <ctype.h>
#include "svalue.h"
#include "pike_types.h"
@@ -18,6 +18,8 @@ RCSID("$Id: pike_types.c,v 1.12 1997/01/04 05:09:25 hubbe Exp $");
#include "mapping.h"
#include "macros.h"
#include "error.h"
+#include "las.h"
+#include "language.h"
int max_correct_args;
@@ -890,10 +892,44 @@ int match_types(struct pike_string *a,struct pike_string *b)
/* FIXME, add the index */
-static struct pike_string *low_index_type(char *t)
+static struct pike_string *low_index_type(char *t, node *n)
{
switch(EXTRACT_UCHAR(t++))
{
+ case T_OBJECT:
+ {
+ struct program *p=id_to_program(EXTRACT_INT(t));
+ if(p)
+ {
+ if(n->token == F_ARROW)
+ {
+ if(find_identifier("`->",p) != -1 || find_identifier("`->=",p) != -1)
+ {
+ reference_shared_string(mixed_type_string);
+ return mixed_type_string;
+ }
+ }else{
+ if(find_identifier("`[]",p) != -1 || find_identifier("`[]=",p) != -1)
+ {
+ reference_shared_string(mixed_type_string);
+ return mixed_type_string;
+ }
+ }
+ if(CDR(n)->token == F_CONSTANT && CDR(n)->u.sval.type==T_STRING)
+ {
+ INT32 i;
+ i=find_shared_string_identifier(CDR(n)->u.sval.u.string, p);
+ if(i==-1)
+ {
+ reference_shared_string(int_type_string);
+ return int_type_string;
+ }else{
+ reference_shared_string(ID_FROM_INT(p, i)->type);
+ return ID_FROM_INT(p, i)->type;
+ }
+ }
+ }
+ }
default:
reference_shared_string(mixed_type_string);
return mixed_type_string;
@@ -901,9 +937,9 @@ static struct pike_string *low_index_type(char *t)
case T_OR:
{
struct pike_string *a,*b;
- a=low_index_type(t);
+ a=low_index_type(t,n);
t+=type_length(t);
- b=low_index_type(t);
+ b=low_index_type(t,n);
if(!b) return a;
if(!a) return b;
push_finished_type(b);
@@ -913,7 +949,7 @@ static struct pike_string *low_index_type(char *t)
}
case T_AND:
- return low_index_type(t+type_length(t));
+ return low_index_type(t+type_length(t),n);
case T_STRING: /* always int */
case T_MULTISET: /* always int */
@@ -928,35 +964,51 @@ static struct pike_string *low_index_type(char *t)
}
}
-struct pike_string *index_type(struct pike_string *type)
+struct pike_string *index_type(struct pike_string *type, node *n)
{
struct pike_string *t;
- t=low_index_type(type->str);
+ t=low_index_type(type->str,n);
if(!t) copy_shared_string(t,mixed_type_string);
return t;
}
-static int low_check_indexing(char *type, char *index_type)
+static int low_check_indexing(char *type, char *index_type, node *n)
{
switch(EXTRACT_UCHAR(type++))
{
case T_OR:
- return low_check_indexing(type,index_type) ||
- low_check_indexing(type+type_length(type),index_type);
+ return low_check_indexing(type,index_type,n) ||
+ low_check_indexing(type+type_length(type),index_type,n);
case T_AND:
- return low_check_indexing(type,index_type) &&
- low_check_indexing(type+type_length(type),index_type);
+ return low_check_indexing(type,index_type,n) &&
+ low_check_indexing(type+type_length(type),index_type,n);
case T_NOT:
- return !low_check_indexing(type,index_type);
+ return !low_check_indexing(type,index_type,n);
case T_STRING:
case T_ARRAY:
return !!low_match_types(int_type_string->str, index_type,0);
case T_OBJECT:
- return !!low_match_types(string_type_string->str, index_type,0);
+ {
+ struct program *p=id_to_program(EXTRACT_INT(type));
+ if(p)
+ {
+ if(n->token == F_ARROW)
+ {
+ if(find_identifier("`->",p) != -1 || find_identifier("`->=",p) != -1)
+ return 1;
+ }else{
+ if(find_identifier("`[]",p) != -1 || find_identifier("`[]=",p) != -1)
+ return 1;
+ }
+ return !!low_match_types(string_type_string->str, index_type,0);
+ }else{
+ return 1;
+ }
+ }
case T_MULTISET:
case T_MAPPING:
@@ -971,12 +1023,13 @@ static int low_check_indexing(char *type, char *index_type)
}
int check_indexing(struct pike_string *type,
- struct pike_string *index_type)
+ struct pike_string *index_type,
+ node *n)
{
CHECK_TYPE(type);
CHECK_TYPE(index_type);
- return low_check_indexing(type->str, index_type->str);
+ return low_check_indexing(type->str, index_type->str, n);
}
/* Count the number of arguments for a funciton type.
diff --git a/src/pike_types.h b/src/pike_types.h
index 77bd058263d49255db3319d59c84ab5a71288aff..50a0af8c677dbf9547f9e4be18946c1b3825291d 100644
--- a/src/pike_types.h
+++ b/src/pike_types.h
@@ -6,6 +6,8 @@
#ifndef PIKE_TYPES_H
#define PIKE_TYPES_H
+#include "las.h"
+
extern int max_correct_args;
extern struct pike_string *string_type_string;
extern struct pike_string *int_type_string;
@@ -29,6 +31,7 @@ void pop_type_stack();
void type_stack_pop_to_mark();
void type_stack_reverse();
void push_type(unsigned char tmp);
+void push_type_int(unsigned INT32 i);
void push_unfinished_type(char *s);
void push_finished_type(struct pike_string *type);
struct pike_string *pop_unfinished_type();
@@ -40,12 +43,13 @@ char *low_describe_type(char *t);
struct pike_string *describe_type(struct pike_string *type);
TYPE_T compile_type_to_runtime_type(struct pike_string *s);
int match_types(struct pike_string *a,struct pike_string *b);
-struct pike_string *index_type(struct pike_string *type);
+struct pike_string *index_type(struct pike_string *type, node *n);
int check_indexing(struct pike_string *type,
- struct pike_string *index_type);
+ struct pike_string *index_type,
+ node *n);
int count_arguments(struct pike_string *s);
struct pike_string *check_call(struct pike_string *args,
- struct pike_string *type);
+ struct pike_string *type);
void check_array_type(struct array *a);
struct pike_string *get_type_of_svalue(struct svalue *s);
char *get_name_of_type(int t);
diff --git a/src/program.c b/src/program.c
index 72c2eeda446c95e0df25fbbd90ff79a846010ec2..9b9cd5d668c59b0ef0d8173a48d3c406a0d1f548 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.13 1997/01/19 09:08:03 hubbe Exp $");
+RCSID("$Id: program.c,v 1.14 1997/01/22 05:19:46 hubbe Exp $");
#include "program.h"
#include "object.h"
#include "dynamic_buffer.h"
@@ -85,6 +85,9 @@ void use_module(struct svalue *s)
}
+static int low_find_shared_string_identifier(struct pike_string *name,
+ struct program *prog);
+
int find_module_identifier(struct pike_string *ident)
{
JMP_BUF tmp;
@@ -116,6 +119,45 @@ int find_module_identifier(struct pike_string *ident)
}
}
UNSETJMP(tmp);
+
+ {
+ struct program_state *p;
+ for(p=previous_program_state;p;p=p->previous)
+ {
+ INT32 i;
+ if(previous_file_state &&
+ previous_file_state->previous_program_state==p->previous)
+ break;
+
+ i=low_find_shared_string_identifier(ident, &p->fake_program);
+ if(i!=-1)
+ {
+ struct identifier *id;
+ id=ID_FROM_INT(&p->fake_program, i);
+ if(IDENTIFIER_IS_CONSTANT(id->flags))
+ {
+ push_svalue(PROG_FROM_INT(&p->fake_program, i)->constants+
+ id->func.offset);
+ return 1;
+ }else{
+ yyerror("Identifier is not a constant");
+ return 0;
+ }
+ }
+ }
+ }
+
+ return 0;
+}
+
+/* This should be optimized */
+struct program *id_to_program(INT32 id)
+{
+ struct program *p;
+ if(id)
+ for(p=first_program;p;p=p->next)
+ if(id==p->id)
+ return p;
return 0;
}
@@ -161,12 +203,18 @@ void start_new_program()
struct pike_string *name;
threads_disabled++;
+ if(local_variables)
+ setup_fake_program();
#define PROGRAM_STATE
#define PUSH
#include "compilation.h"
#undef PUSH
#undef PROGRAM_STATE
+ if(previous_program_state->fake_program.num_inherits)
+ previous_program_state->fake_program.inherits[0].prog=
+ &previous_program_state->fake_program;
+
for(e=0; e<NUM_AREAS; e++) low_reinit_buf(areas + e);
low_reinit_buf(& inherit_names);
low_reinit_buf(& used_modules);
@@ -569,6 +617,8 @@ struct program *end_program()
#include "compilation.h"
#undef POP
#undef PROGRAM_STATE
+ if(fake_program.num_inherits)
+ fake_program.inherits[0].prog=&fake_program;
threads_disabled--;
free_all_nodes();
return prog;
diff --git a/src/program.h b/src/program.h
index 115911a3155a610e32a45efd3bf8c0b6efc5227c..c90a9240adac64fa069dc6a04d50cb02551be4d7 100644
--- a/src/program.h
+++ b/src/program.h
@@ -184,6 +184,7 @@ extern struct program fake_program;
/* Prototypes begin here */
void use_module(struct svalue *s);
int find_module_identifier(struct pike_string *ident);
+struct program *id_to_program(INT32 id);
void setup_fake_program();
void start_new_program();
void really_free_program(struct program *p);
diff --git a/src/testsuite.in b/src/testsuite.in
index 5247de7b7d5532b5dc2ab2686ea7fe9fcd7b9579..ed6e1c0d4e55e3dfe207059cbd60bbb8c03a379d 100644
--- a/src/testsuite.in
+++ b/src/testsuite.in
@@ -1,10 +1,20 @@
+test_compile_error(int foo() { LJjjjjJJJ ; })
+test_true(clone(class { constant i=1; })->i)
+test_true(clone(class { constant i=0; mixed `->(string s) { if(s=="i") return 1; }})->i)
+test_true(clone(class { constant i=1; mixed `->(string s) { return 0; }})["i"])
+test_true(clone(class { constant i=0; mixed `[](string s) { if(s=="i") return 1; }})["i"])
+test_true(clone(class { mixed `[]=(mixed a, mixed b) { if(a!=b) throw(1); }})[1]=1)
+test_true(clone(class { mixed `->=(mixed a, mixed b) { if(a!=b) throw(1); }})->i="i")
+
+test_compile(class A {}; class B { inherit A; })
+
test_true(mappingp(_memory_usage()))
test_true(objectp( _next(this_object()) || _prev(this_object())))
test_true(arrayp( _next(({})) || _prev(({}))))
test_any(object o=this_object(); while(o=_next(o)));
test_any(object o=this_object(); while(o=_prev(o)));
-test_true([["$Id: testsuite.in,v 1.15 1996/12/07 23:41:06 hubbe Exp $"]])
+test_true([["$Id: testsuite.in,v 1.16 1997/01/22 05:19:47 hubbe Exp $"]])
test_any([[object(File) o=File(); return objectp(o);]],1)
test_any([[object o=Regexp("foo"); return objectp(o);]],1)
test_any([[object o=Regexp("foo"); return object_program(o);]],Regexp)
diff --git a/src/version.c b/src/version.c
index 41fd1f63e4dffe4eb489999f60066c539c829f8e..ee9d1c6b82c6ce1f5d49053a30a7190ce0a9eaee 100644
--- a/src/version.c
+++ b/src/version.c
@@ -1,3 +1,9 @@
+/*\
+||| This file a part of Pike, and is copyright by Fredrik Hubinette
+||| Pike is distributed as GPL (General Public License)
+||| See the files COPYING and DISCLAIMER for more information.
+\*/
+
#include "global.h"
#include "svalue.h"
#include "interpret.h"
@@ -6,5 +12,5 @@
void f_version(INT32 args)
{
pop_n_elems(args);
- push_text("Pike v0.4pl4");
+ push_text("Pike v0.4pl5");
}
diff --git a/src/version.h b/src/version.h
index 301b8aad4f3f9404d1dc14515fea3481f4fa62af..f982194f24bb071287dd6efde8bd93fd4c886a7c 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1,3 +1,9 @@
+/*\
+||| This file a part of Pike, and is copyright by Fredrik Hubinette
+||| Pike is distributed as GPL (General Public License)
+||| See the files COPYING and DISCLAIMER for more information.
+\*/
+
/* Prototypes begin here */
void f_version(INT32 args);
/* Prototypes end here */