cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop

Browse Source
This commit is contained in:
Gav Wood 2015-01-07 20:23:59 +01:00
commit d18fa27b6a
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Compiler.h
View File

@ -30,7 +30,7 @@ namespace solidity {
class Compiler: private ASTConstVisitor
{
public:
explicit Compiler(bool _optimize = false): m_optimize(_optimize), m_returnTag(m_context.newTag()) {}
explicit Compiler(bool _optimize = false): m_optimize(_optimize), m_context(), m_returnTag(m_context.newTag()) {}
void compileContract(ContractDefinition const& _contract, std::vector<MagicVariableDeclaration const*> const& _magicGlobals,
std::map<ContractDefinition const*, bytes const*> const& _contracts);

2
CompilerStack.h
View File

@ -113,7 +113,7 @@ private:
struct Contract
{
ContractDefinition const* contract;
ContractDefinition const* contract = nullptr;
std::shared_ptr<Compiler> compiler;
bytes bytecode;
std::shared_ptr<InterfaceHandler> interfaceHandler;

6
ExpressionCompiler.h
View File

@ -146,12 +146,12 @@ private:
private:
CompilerContext* m_context;
LValueType m_type;
LValueType m_type = NONE;
/// If m_type is STACK, this is base stack offset (@see
/// CompilerContext::getBaseStackOffsetOfVariable) of a local variable.
unsigned m_baseStackOffset;
unsigned m_baseStackOffset = 0;
/// Size of the value of this lvalue on the stack.
unsigned m_stackSize;
unsigned m_stackSize = 0;
};
bool m_optimize;

2
GlobalContext.h
View File

@ -56,7 +56,7 @@ public:
private:
std::vector<std::shared_ptr<MagicVariableDeclaration const>> m_magicVariables;
ContractDefinition const* m_currentContract;
ContractDefinition const* m_currentContract = nullptr;
std::map<ContractDefinition const*, std::shared_ptr<MagicVariableDeclaration const>> mutable m_thisPointer;
};

2
NameAndTypeResolver.h
View File

@ -69,7 +69,7 @@ private:
/// not contain code.
std::map<ASTNode const*, DeclarationContainer> m_scopes;
DeclarationContainer* m_currentScope;
DeclarationContainer* m_currentScope = nullptr;
};
/**