mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Instance method fixes.

This commit is contained in:
rogerl%netscape.com 2003-05-06 22:53:39 +00:00
Родитель b6f1b4f121
Коммит 8020e01752
4 изменённых файлов: 27 добавлений и 83 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

7
js2/src/js2engine.cpp
Просмотреть файл

@ -966,7 +966,12 @@ namespace MetaData {
JS2Object *obj = JS2VAL_TO_OBJECT(thisValue);
ASSERT(obj->kind == ClassKind);
JS2Class *c = checked_cast<JS2Class *>(obj);
return OBJECT_TO_JS2VAL(new SimpleInstance(meta, c->prototype, c));
SimpleInstance *result = new SimpleInstance(meta, c->prototype, c);
DEFINE_ROOTKEEPER(rk, result);
if (c->init) {
meta->invokeFunction(c->init, OBJECT_TO_JS2VAL(result), NULL, 0);
}
return OBJECT_TO_JS2VAL(result);
}
// Save current engine state (pc, environment top) and

14
js2/src/js2eval.cpp
Просмотреть файл

@ -290,30 +290,30 @@ namespace MetaData {
CompilationData *oldData = startCompilationUnit(bCon, bCon->mSource, bCon->mSourceLocation);
ParameterFrame *runtimeFrame = new ParameterFrame(fWrap->compileFrame);
DEFINE_ROOTKEEPER(rk, runtimeFrame);
runtimeFrame->instantiate(env);
runtimeFrame->instantiate(fWrap->env);
runtimeFrame->thisObject = thisValue;
runtimeFrame->assignArguments(this, fnObj, argv, argc, argc);
Frame *oldTopFrame = env->getTopFrame();
Frame *oldTopFrame = fWrap->env->getTopFrame();
if (fInst->isMethodClosure)
env->addFrame(objectType(thisValue));
env->addFrame(runtimeFrame);
fWrap->env->addFrame(objectType(thisValue));
fWrap->env->addFrame(runtimeFrame);
ParameterFrame *oldPFrame = engine->parameterFrame;
try {
savePC = engine->pc;
engine->pc = NULL;
engine->parameterFrame = runtimeFrame;
result = engine->interpret(RunPhase, bCon, env);
result = engine->interpret(RunPhase, bCon, fWrap->env);
}
catch (Exception &x) {
engine->pc = savePC;
restoreCompilationUnit(oldData);
env->setTopFrame(oldTopFrame);
fWrap->env->setTopFrame(oldTopFrame);
engine->parameterFrame = oldPFrame;
throw x;
}
engine->pc = savePC;
restoreCompilationUnit(oldData);
env->setTopFrame(oldTopFrame);
fWrap->env->setTopFrame(oldTopFrame);
engine->parameterFrame = oldPFrame;
}
}

84
js2/src/js2metadata.cpp
Просмотреть файл

@ -101,23 +101,21 @@ namespace MetaData {
try {
env->addFrame(compileFrame);
VariableBinding *pb = fnDef->parameters;
uint32 pCount = 0;
if (pb) {
uint32 pCount = 0;
while (pb) {
pCount++;
pb = pb->next;
}
if (prototype)
createDynamicProperty(result, engine->length_StringAtom, INT_TO_JS2VAL(pCount), ReadAccess, true, false);
result->fWrap->length = pCount;
pb = fnDef->parameters;
while (pb) {
// XXX define a static binding for each parameter
FrameVariable *v = new FrameVariable(compileFrame->allocateSlot(), FrameVariable::Parameter);
pb->mn = defineLocalMember(env, pb->name, NULL, Attribute::NoOverride, false, ReadWriteAccess, v, pb->pos, true);
pb = pb->next;
}
}
createDynamicProperty(result, engine->length_StringAtom, INT_TO_JS2VAL(pCount), ReadAccess, true, false);
result->fWrap->length = pCount;
ValidateStmt(cxt, env, Plural, fnDef->body);
env->removeTopFrame();
}
@ -524,74 +522,6 @@ namespace MetaData {
|| (topFrame->kind == ParameterFrameKind));
validateStatic(cxt, env, &f->function, a, unchecked, hoisted, p->pos);
}
/*
bool prototype = unchecked || a->prototype;
Attribute::MemberModifier memberMod = a->memberMod;
if (topFrame->kind == ClassKind) {
if (memberMod == Attribute::NoModifier)
memberMod = Attribute::Virtual;
}
else {
if (memberMod != Attribute::NoModifier)
reportError(Exception::definitionError, "Illegal attribute", p->pos);
}
if (prototype && ((f->function.prefix != FunctionName::normal) || (memberMod == Attribute::Constructor))) {
reportError(Exception::definitionError, "Illegal attribute", p->pos);
}
js2val compileThis = JS2VAL_VOID;
if (prototype || (memberMod == Attribute::Constructor)
|| (memberMod == Attribute::Virtual)
|| (memberMod == Attribute::Final))
compileThis = JS2VAL_INACCESSIBLE;
switch (memberMod) {
case Attribute::NoModifier:
case Attribute::Static:
{
if (f->function.prefix != FunctionName::normal) {
// XXX getter/setter --> ????
}
else {
FunctionInstance *fObj = validateStaticFunction(&f->function, compileThis, prototype, unchecked, cxt, env);
if (unchecked
&& (f->attributes == NULL)
&& ((topFrame->kind == PackageKind)
|| (topFrame->kind == BlockFrameKind)
|| (topFrame->kind == ParameterFrameKind)) ) {
LocalMember *v = defineHoistedVar(env, f->function.name, p, false, OBJECT_TO_JS2VAL(fObj));
}
else {
Variable *v = new Variable(functionClass, OBJECT_TO_JS2VAL(fObj), true);
defineLocalMember(env, f->function.name, &a->namespaces, a->overrideMod, a->xplicit, ReadWriteAccess, v, p->pos, true);
}
}
}
break;
case Attribute::Virtual:
case Attribute::Final:
{
FunctionInstance *fObj = validateStaticFunction(&f->function, compileThis, prototype, unchecked, cxt, env);
JS2Class *c = checked_cast<JS2Class *>(env->getTopFrame());
Multiname *mn = new Multiname(f->function.name, a->namespaces);
InstanceMember *m;
switch (f->function.prefix) {
case FunctionName::normal:
m = new InstanceMethod(mn, fObj, (memberMod == Attribute::Final), true);
break;
case FunctionName::Set:
m = new InstanceSetter(mn, fObj, objectClass, (memberMod == Attribute::Final), true);
break;
case FunctionName::Get:
m = new InstanceGetter(mn, fObj, objectClass, (memberMod == Attribute::Final), true);
break;
}
defineInstanceMember(c, cxt, f->function.name, a->namespaces, a->overrideMod, a->xplicit, m, p->pos);
}
break;
}
*/
}
break;
case StmtNode::Var:
@ -1641,6 +1571,12 @@ namespace MetaData {
return ca;
}
else
if (name == world.identifiers["enumerable"]) {
ca = new CompoundAttribute();
ca->enumerable = true;
return ca;
}
else
if (name == world.identifiers["virtual"]) {
ca = new CompoundAttribute();
ca->memberMod = Attribute::Virtual;
@ -1746,7 +1682,7 @@ namespace MetaData {
}
CompoundAttribute::CompoundAttribute() : Attribute(CompoundAttr),
namespaces(NULL), xplicit(false), dynamic(false), memberMod(NoModifier),
namespaces(NULL), xplicit(false), enumerable(false), dynamic(false), memberMod(NoModifier),
overrideMod(NoOverride), prototype(false), unused(false)
{
}

5
js2/src/js2metadata.h
Просмотреть файл

@ -750,7 +750,9 @@ public:
Callor *call; // A procedure to call when this class is used in a call expression
Constructor *construct; // A procedure to call when this class is used in a new expression
FunctionInstance *init;
FunctionInstance *init; // A procedure to call to initialize a newly created instance of this
// class or null if no special initialization is needed. 'init' is
// called by 'construct'
void emitDefaultValue(BytecodeContainer *bCon, size_t pos);
@ -1294,6 +1296,7 @@ public:
NamespaceList namespaces; // The set of namespaces contained in this attribute
bool xplicit; // true if the explicit attribute has been given
bool enumerable; // true if the enumerable attribute has been given
bool dynamic; // true if the dynamic attribute has been given
MemberModifier memberMod; // if one of these attributes has been given; none if not.
OverrideModifier overrideMod; // if the override attribute with one of these arguments was given;