teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

added verification for explicit references (check if the given ID exists)

Browse source
This commit is contained in:
Marc Zinnschlag 2010-07-09 20:35:34 +02:00
parent d4ac3b506e
commit c37b007be0
7 changed files with 43 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/mwcompiler/context.cpp
View file

@ -12,5 +12,10 @@ namespace SACompiler
{
return ' ';
}
bool Context::isId (const std::string& name) const
{
return false;
}
}

5
apps/mwcompiler/context.hpp
View file

@ -13,7 +13,10 @@ namespace SACompiler
///< Is the compiler allowed to declare local variables?
virtual char getGlobalType (const std::string& name) const;
///< 'l: long, 's': short, 'f': float, ' ': does not exist.
///< 'l: long, 's': short, 'f': float, ' ': does not exist.
virtual bool isId (const std::string& name) const;
///< Does \a name match an ID, that can be referenced?
};
}

25
apps/openmw/mwscript/compilercontext.cpp
View file

@ -31,5 +31,30 @@ namespace MWScript
return ' ';
}
bool CompilerContext::isId (const std::string& name) const
{
return
mEnvironment.mWorld->getStore().activators.find (name) ||
mEnvironment.mWorld->getStore().potions.find (name) ||
mEnvironment.mWorld->getStore().appas.find (name) ||
mEnvironment.mWorld->getStore().armors.find (name) ||
mEnvironment.mWorld->getStore().books.find (name) ||
mEnvironment.mWorld->getStore().clothes.find (name) ||
mEnvironment.mWorld->getStore().containers.find (name) ||
mEnvironment.mWorld->getStore().creatures.find (name) ||
mEnvironment.mWorld->getStore().doors.find (name) ||
mEnvironment.mWorld->getStore().ingreds.find (name) ||
mEnvironment.mWorld->getStore().creatureLists.find (name) ||
mEnvironment.mWorld->getStore().itemLists.find (name) ||
mEnvironment.mWorld->getStore().lights.find (name) ||
mEnvironment.mWorld->getStore().lockpicks.find (name) ||
mEnvironment.mWorld->getStore().miscItems.find (name) ||
mEnvironment.mWorld->getStore().npcs.find (name) ||
mEnvironment.mWorld->getStore().probes.find (name) ||
mEnvironment.mWorld->getStore().repairs.find (name) ||
mEnvironment.mWorld->getStore().statics.find (name) ||
mEnvironment.mWorld->getStore().weapons.find (name);
}
}

3
apps/openmw/mwscript/compilercontext.hpp
View file

@ -35,6 +35,9 @@ namespace MWScript
/// 'l: long, 's': short, 'f': float, ' ': does not exist.
virtual char getGlobalType (const std::string& name) const;
virtual bool isId (const std::string& name) const;
///< Does \a name match an ID, that can be referenced?
};
}

5
components/compiler/context.hpp
View file

@ -31,7 +31,10 @@ namespace Compiler
}
virtual char getGlobalType (const std::string& name) const = 0;
///< 'l: long, 's': short, 'f': float, ' ': does not exist.
///< 'l: long, 's': short, 'f': float, ' ': does not exist.
virtual bool isId (const std::string& name) const = 0;
///< Does \a name match an ID, that can be referenced?
};
}

2
components/compiler/exprparser.cpp
View file

@ -275,7 +275,7 @@ namespace Compiler
return true;
}
if (mOperands.empty() && mOperators.empty() && mExplicit.empty())
if (mExplicit.empty() && getContext().isId (name))
{
mExplicit = name;
return true;

2
components/compiler/lineparser.cpp
View file

@ -129,7 +129,7 @@ namespace Compiler
return false;
}
if (mState==BeginState)
if (mState==BeginState && getContext().isId (name))
{
mState = PotentialExplicitState;
mExplicit = toLower (name);