Skip to content

Commit

Permalink
BREAKING CHANGE: remove syntax in 0.4 to compatible with solidity
Browse files Browse the repository at this point in the history
  • Loading branch information
charles-liu committed Dec 27, 2021
1 parent 3726ab4 commit f7fa26b
Show file tree
Hide file tree
Showing 2,574 changed files with 28,276 additions and 9,386 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ include(ViteUtils)

include(EthToolchains)

option(SOLC_LINK_STATIC "Link solc executable statically on supported platforms" OFF)
option(SOLC_LINK_STATIC "Link solc executable statically on supported platforms" ON)
option(SOLC_STATIC_STDLIBS "Link solc against static versions of libgcc and libstdc++ on supported platforms" OFF)

# Let's find our dependencies
Expand All @@ -37,7 +37,7 @@ find_package(Threads)
include(EthPolicy)
eth_policy()

set(PROJECT_VERSION "0.8.0")
set(PROJECT_VERSION "0.8.1")

# Figure out what compiler and system are we using
include(ViteCompilerSettings)
Expand Down
2 changes: 1 addition & 1 deletion libevmasm/Instruction.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ static std::map<Instruction, InstructionInfo> const c_instructionInfo =
{ Instruction::CALLCODE, { "CALLCODE", 0, 5, 1, true, Tier::Special } },

{ Instruction::RETURN, { "RETURN", 0, 2, 0, true, Tier::Zero } },
{ Instruction::DELEGATECALL, { "DELEGATECALL", 0, 6, 1, true, Tier::Special } },
{ Instruction::DELEGATECALL, { "DELEGATECALL", 0, 5, 1, true, Tier::Special } },

// Solidity++:
{ Instruction::SYNCCALL, { "SYNCCALL", 0, 6, 0, true, Tier::Special } },
Expand Down
8 changes: 1 addition & 7 deletions liblangutil/Token.h
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,6 @@ namespace solidity::langutil
K(Send, "send", 0) \
\
K(Event, "event", 0) \
/* Solidity++: message keyword */ \
K(Message, "message", 0) \
/* Solidity++: offchain keyword */ \
K(Offchain, "offchain", 0) \
\
K(External, "external", 0) \
K(Fallback, "fallback", 0) \
Expand Down Expand Up @@ -250,8 +246,6 @@ namespace solidity::langutil
K(Var, "var", 0) \
\
/* Solidity++ keywords */ \
K(OnMessage, "onMessage", 0) \
K(Getter, "getter", 0) \
K(Async, "async", 0) \
K(Await, "await", 0) \
\
Expand Down Expand Up @@ -294,7 +288,7 @@ namespace TokenTraits
constexpr bool isCountOp(Token op) { return op == Token::Inc || op == Token::Dec; }
constexpr bool isShiftOp(Token op) { return (Token::SHL <= op) && (op <= Token::SHR); }
constexpr bool isVariableVisibilitySpecifier(Token op) { return op == Token::Public || op == Token::Private || op == Token::Internal; }
constexpr bool isVisibilitySpecifier(Token op) { return isVariableVisibilitySpecifier(op) || op == Token::External || op == Token::Offchain; } // Solidity++: add offchain visibility
constexpr bool isVisibilitySpecifier(Token op) { return isVariableVisibilitySpecifier(op) || op == Token::External; }
constexpr bool isLocationSpecifier(Token op) { return op == Token::Memory || op == Token::Storage || op == Token::CallData; }

constexpr bool isStateMutabilitySpecifier(Token op)
Expand Down
35 changes: 22 additions & 13 deletions libsolidity/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ set(ORIGINAL_SOURCE_DIR ${PROJECT_SOURCE_DIR}/solidity/libsolidity)
set(sources
${ORIGINAL_SOURCE_DIR}/analysis/ConstantEvaluator.cpp
${ORIGINAL_SOURCE_DIR}/analysis/ConstantEvaluator.h
analysis/ContractLevelChecker.cpp
analysis/ContractLevelChecker.h
${ORIGINAL_SOURCE_DIR}/analysis/ContractLevelChecker.cpp
${ORIGINAL_SOURCE_DIR}/analysis/ContractLevelChecker.h
${ORIGINAL_SOURCE_DIR}/analysis/ControlFlowAnalyzer.cpp
${ORIGINAL_SOURCE_DIR}/analysis/ControlFlowAnalyzer.h
${ORIGINAL_SOURCE_DIR}/analysis/ControlFlowBuilder.cpp
Expand Down Expand Up @@ -34,25 +34,34 @@ set(sources
${ORIGINAL_SOURCE_DIR}/analysis/Scoper.h
${ORIGINAL_SOURCE_DIR}/analysis/StaticAnalyzer.cpp
${ORIGINAL_SOURCE_DIR}/analysis/StaticAnalyzer.h
analysis/SyntaxChecker.cpp
${ORIGINAL_SOURCE_DIR}/analysis/SyntaxChecker.h
analysis/TypeChecker.cpp
analysis/SolidityppSyntaxChecker.cpp
analysis/SolidityppSyntaxChecker.h
${ORIGINAL_SOURCE_DIR}/analysis/SyntaxChecker.cpp
analysis/SyntaxChecker.h
analysis/SolidityppTypeChecker.cpp
analysis/SolidityppTypeChecker.h
${ORIGINAL_SOURCE_DIR}/analysis/TypeChecker.cpp
analysis/TypeChecker.h
${ORIGINAL_SOURCE_DIR}/analysis/ViewPureChecker.cpp
${ORIGINAL_SOURCE_DIR}/analysis/ViewPureChecker.h
ast/AST.cpp
ast/AST.h
ast/AST_accept.h
ast/SolidityppAST.cpp
ast/SolidityppAST.h
${ORIGINAL_SOURCE_DIR}/ast/AST_accept.h
ast/SolidityppAST_accept.h
${ORIGINAL_SOURCE_DIR}/ast/ASTAnnotations.cpp
ast/ASTAnnotations.h
ast/ASTEnums.h
ast/ASTForward.h
ast/ASTJsonConverter.cpp
ast/SolidityppASTJsonConverter.cpp
ast/SolidityppASTJsonConverter.h
${ORIGINAL_SOURCE_DIR}/ast/ASTJsonConverter.cpp
ast/ASTJsonConverter.h
${ORIGINAL_SOURCE_DIR}/ast/ASTUtils.cpp
${ORIGINAL_SOURCE_DIR}/ast/ASTUtils.h
ast/ASTJsonImporter.cpp
ast/ASTJsonImporter.h
${ORIGINAL_SOURCE_DIR}/ast/ASTJsonImporter.cpp
${ORIGINAL_SOURCE_DIR}/ast/ASTJsonImporter.h
ast/ASTVisitor.h
${ORIGINAL_SOURCE_DIR}/ast/ExperimentalFeatures.h
ast/Types.cpp
Expand Down Expand Up @@ -122,8 +131,8 @@ set(sources
${ORIGINAL_SOURCE_DIR}/formal/SymbolicVariables.h
${ORIGINAL_SOURCE_DIR}/formal/VariableUsage.cpp
${ORIGINAL_SOURCE_DIR}/formal/VariableUsage.h
interface/ABI.cpp
interface/ABI.h
${ORIGINAL_SOURCE_DIR}/interface/ABI.cpp
${ORIGINAL_SOURCE_DIR}/interface/ABI.h
interface/CompilerStack.cpp
interface/CompilerStack.h
${ORIGINAL_SOURCE_DIR}/interface/DebugSettings.h
Expand All @@ -137,8 +146,8 @@ set(sources
${ORIGINAL_SOURCE_DIR}/interface/StandardCompiler.h
${ORIGINAL_SOURCE_DIR}/interface/StorageLayout.cpp
${ORIGINAL_SOURCE_DIR}/interface/StorageLayout.h
${ORIGINAL_SOURCE_DIR}/interface/Version.cpp
${ORIGINAL_SOURCE_DIR}/interface/Version.h
interface/Version.cpp
interface/Version.h
${ORIGINAL_SOURCE_DIR}/parsing/DocStringParser.cpp
${ORIGINAL_SOURCE_DIR}/parsing/DocStringParser.h
parsing/Parser.cpp
Expand Down
Loading

0 comments on commit f7fa26b

Please sign in to comment.