aboutsummaryrefslogtreecommitdiffstats
path: root/libsolidity
Commit message (Collapse)AuthorAgeFilesLines
* add another test case for continue not in loopLu Guanqun2016-01-191-4/+4
|
* code changes according to Chris's commentsLu Guanqun2016-01-193-20/+16
|
* check whether break/continue is in the loopLu Guanqun2016-01-156-0/+156
|
* clarification on dynamic arrays, switcheroo on typepointer, and a ↵RJ Catalano2016-01-121-1/+1
| | | | documentation test added
* Merge branch 'develop' of https://github.com/ethereum/solidity into developRJ Catalano2016-01-121-0/+3
|\
| * Fixed a crash during type checking.chriseth2016-01-081-0/+3
| |
* | final changes to typechecker, the expression compiler, and a couple more ↵RJ Catalano2016-01-122-23/+32
| | | | | | | | tests for good measure
* | Update ExpressionCompiler.cppRJ2016-01-111-14/+16
| |
* | Update ExpressionCompiler.cppRJ2016-01-111-4/+2
| |
* | Update ExpressionCompiler.cppRJ2016-01-101-17/+39
| |
* | find common typeRJ2016-01-101-2/+11
|/
* Merge pull request #338 from guanqun/add_parenchriseth2016-01-052-2/+10
|\ | | | | support syntax "(x) = 3"
| * support decayed tuple expression as left valueLu Guanqun2016-01-042-2/+10
| |
* | Merge pull request #317 from chriseth/pathsEverywherechriseth2016-01-045-23/+26
|\ \ | |/ |/| Use paths instead of simple identifiers wherever possible.
| * Use paths instead of simple identifiers wherever possible.chriseth2015-12-225-23/+26
| |
* | Merge pull request #308 from chriseth/fixoverloadbugchriseth2015-12-211-0/+2
|\ \ | | | | | | Fix bug preventing overloads of different array types.
| * | Fix bug preventing overloads of different array types.chriseth2015-12-181-0/+2
| | |
* | | Merge pull request #309 from chriseth/fix_cross_contract_enum_accesschriseth2015-12-212-14/+29
|\ \ \ | |_|/ |/| | Add structs and enums to contract types.
| * | Add structs and enums to contract types.chriseth2015-12-182-14/+29
| |/
* | Merge pull request #311 from guanqun/correct-boolean-literal-positionchriseth2015-12-191-0/+1
|\ \ | |/ |/| correct true/false literal's source
| * correct true/false literal's sourceLu Guanqun2015-12-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Before: Literal, token: true value: true Type: bool Source: "true;" After: Literal, token: true value: true Type: bool Source: "true" Extra token is removed.
* | Simple aliasing during import.chriseth2015-12-189-52/+140
| |
* | Parse complex import directives.chriseth2015-12-186-28/+93
| |
* | changed error messageRJ Catalano2015-12-171-1/+1
| |
* | updated tests and much simpler algorithm for parsing errorsRJ Catalano2015-12-171-7/+6
| |
* | added one more test and realized that there was one last change before the ↵RJ Catalano2015-12-171-1/+1
| | | | | | | | parser is perfect
* | Parsing is completeRJ Catalano2015-12-171-3/+3
| |
* | changed a couple of small nuances, made an attempt at fixing the parsing in ↵RJ Catalano2015-12-172-12/+8
| | | | | | | | the inline arrays case (fails), and added test for inline arrays per Chriseth request
* | temporary assert addedRJ Catalano2015-12-171-0/+1
| |
* | still not able to get types resolved, however it is compilingRJ Catalano2015-12-161-2/+9
| |
* | new testsRJ Catalano2015-12-161-1/+0
| |
* | now is compiling and passing soltest...but I think there may be a few more ↵RJ Catalano2015-12-162-5/+9
| | | | | | | | things to do
* | fixed case statementsRJ Catalano2015-12-162-1/+3
| |
* | changing Tuple ConstructorRJ Catalano2015-12-161-2/+5
| |
* | updated attempt...still a bit more work to do but here's what's currentRJ Catalano2015-12-162-2/+4
|\ \
| * | Inline array declarations completeRJ Catalano2015-12-152-2/+42
| |/
* | updated attempt, a couple of more things to sort through and changeRJ Catalano2015-12-161-4/+6
| |
* | Merge pull request #288 from chriseth/import_contextschriseth2015-12-1510-66/+172
|\ \ | |/ |/| Do not clutter importee when importing.
| * Style.chriseth2015-12-151-4/+4
| |
| * Relative paths in import directives.chriseth2015-12-106-9/+50
| |
| * Source units are independent scopes.chriseth2015-12-107-46/+105
| |
| * Bugfix concerning pointers to moved data.chriseth2015-12-082-21/+27
| |
* | Merge pull request #289 from chriseth/fix_base_constructor_paramschriseth2015-12-101-0/+3
|\ \ | | | | | | Fix: Type checker crash for wrong number of base constructor arguments.
| * | Fix: Type checker crash for wrong number of base constructor arguments.chriseth2015-12-101-0/+3
| |/
* / Fix: Segfaults connected to paramater types.chriseth2015-12-102-4/+4
|/ | | | parameterTypes does not return by const reference anymore.
* Code generation for calling bound methods.chriseth2015-12-012-4/+41
|
* Merge pull request #261 from chriseth/datalocchriseth2015-12-011-20/+24
|\ | | | | Bugfix for explicit memory types in libraries.
| * Bugfix for explicit memory types in libraries.chriseth2015-12-011-20/+24
| |
* | Simplify and optimise stack rotation.chriseth2015-12-012-8/+27
|/
* Merge pull request #251 from chriseth/bind2chriseth2015-11-3014-292/+430
|\ | | | | Bind library functions to types.
| * Also check the object type for bound functions.chriseth2015-11-294-9/+23
| |
| * Add bound functions to types.chriseth2015-11-295-204/+260
| |
| * Added the `using x for y` directive.chriseth2015-11-278-3/+87
| |
| * Resolve type names using regular AST visit.chriseth2015-11-272-82/+66
| |
* | Merge pull request #256 from chriseth/selfdestructchriseth2015-11-303-3/+5
|\ \ | | | | | | Introduce selfdestruct alias for suicide.
| * | Introduce selfdestruct alias for suicide.chriseth2015-11-293-3/+5
| |/
* / Bugfix for constructor unpacking with fixed-size arrays.chriseth2015-11-291-5/+13
|/
* Convert filter to template function.chriseth2015-11-272-60/+20
|
* Invalidate cached members if scope changes.chriseth2015-11-262-1/+3
|
* Do not store elements of a contract by AST node type.chriseth2015-11-2613-144/+133
|
* Make members context-sensitive.chriseth2015-11-2614-79/+71
|
* Fix MSVC errors and warnings.chriseth2015-11-264-6/+7
|
* Make some functions const.chriseth2015-11-262-4/+4
|
* Code generation for creating arrays.chriseth2015-11-263-9/+67
|
* Type checking for creating new arrays.chriseth2015-11-264-6/+30
|
* Allow "new expressions" also for general type names.chriseth2015-11-267-34/+56
| | | | | | | Breaking change: If you want to send value with a contract creation, you have to use parentheses now: `(new ContractName).value(2 ether)(arg1, arg2)`
* Fix solidity dependencies.chriseth2015-11-261-1/+1
|
* Style.chriseth2015-11-251-1/+2
|
* Again some why3 fixes with regards to separators in blocks.chriseth2015-11-252-26/+34
|
* Merge pull request #245 from chriseth/buildfixeschriseth2015-11-251-1/+1
|\ | | | | Build dependency fixes.
| * Build dependency fixes.chriseth2015-11-241-1/+1
| |
* | Merge pull request #244 from chriseth/fix_stringAllocchriseth2015-11-246-14/+8
|\ \ | |/ |/| Fix for memory allocation bug.
| * Fixed string inside struct allocation bug.chriseth2015-11-246-14/+8
| |
* | Merge pull request #241 from chriseth/why3VariablesInConditionschriseth2015-11-242-18/+114
|\ \ | |/ |/| Why3 variables in conditions
| * Style.chriseth2015-11-231-2/+5
| |
| * addmod and mulmod for why3.chriseth2015-11-231-17/+36
| |
| * Why3: Direct references to variables using `#`.chriseth2015-11-232-1/+75
| |
* | Merge pull request #236 from ethereum/hot_gavGav Wood2015-11-233-9/+10
|\ \ | |/ |/| Fix up for new API from EIP-1.1.
| * Fix up for new API from EIP-1.1.Gav Wood2015-11-213-9/+10
| |
* | Merge pull request #229 from chriseth/fv_storage_typeschriseth2015-11-192-20/+70
|\ \ | | | | | | Formal Verification: State variables.
| * | Formal Verification: State variables.chriseth2015-11-192-20/+70
| | |
* | | Merge pull request #227 from chriseth/addmodchriseth2015-11-193-0/+20
|\ \ \ | | | | | | | | Addmod and mulmod.
| * | | Addmod and mulmod.chriseth2015-11-193-0/+20
| |/ /
* | | Merge pull request #204 from ethereum/hot_gavGav Wood2015-11-191-2/+4
|\ \ \ | |/ / |/| / | |/ The Big Refactor
| * Minor API change - must provide SealEngine to Executive now.Gav Wood2015-11-191-2/+4
| |
* | Merge pull request #218 from chriseth/fix_overwriteMemorychriseth2015-11-171-3/+13
|\ \ | | | | | | Fix memory overwrite problem for arrays.
| * | Fix memory overwrite problem for arrays.chriseth2015-11-171-3/+13
| | |
* | | Fix dynamic indexed event arguments - applies sha3.chriseth2015-11-171-5/+18
|/ /
* | Fix problems with statement blocks.chriseth2015-11-113-21/+48
| |
* | style fixLianaHus2015-11-072-12/+14
| |
* | style fixesLianaHus2015-11-073-25/+26
| |
* | fixed test frameworkLianaHus2015-11-072-10/+8
| |
* | fixLianaHus2015-11-073-35/+60
| |
* | fixed return valu for resolverLianaHus2015-11-072-5/+5
| |
* | added SourceLocations to error reporting for ReferenceResolverLianaHus2015-11-072-15/+18
| |
* | passed SourceLocations instead of nodes to the error reporting functionLianaHus2015-11-075-109/+116
| |
* | fixed buildLianaHus2015-11-071-3/+4
| |
* | added errors tu ReferencesResolverLianaHus2015-11-073-55/+78
|/
* Fix: Cope with non-existing commit hash.chriseth2015-11-031-1/+4
|
* Bugfix: Returning literal strings in tuples.chriseth2015-11-012-2/+6
|
* Rename error type.chriseth2015-10-283-4/+4
|
* Preliminary why3 code output.chriseth2015-10-277-19/+682
|
* Allow docstrings for statements.chriseth2015-10-277-64/+126
|
* Fix indent.chriseth2015-10-271-3/+3
|
* Store docstrings in AST annotations.chriseth2015-10-2611-335/+509
|
* Merge pull request #171 from LianaHus/sol_change_expected_error_in_parserchriseth2015-10-231-3/+19
|\ | | | | Sol change "expected" errors in parser
| * more correctionsLianaHus2015-10-231-4/+14
| |
| * modified error msgLianaHus2015-10-231-1/+7
| |
* | Fix override warning.chriseth2015-10-231-1/+1
|/
* File reorganisation.chriseth2015-10-2159-144/+150
|
* Correctly parse ambiguities like `A.B[10] x` and `x.y[10] = 3`.chriseth2015-10-162-27/+60
|
* Merge pull request #143 from chriseth/loneStructArraychriseth2015-10-161-0/+10
|\ | | | | Fix errors when struct array type is used on its own.
| * Fix errors when struct array type is used on its own.chriseth2015-10-161-0/+10
| |
* | Merge pull request #142 from chriseth/fixWarningschriseth2015-10-161-1/+1
|\ \ | | | | | | Fix warning.
| * | Fix warning.chriseth2015-10-161-1/+1
| |/
* | Merge pull request #141 from chriseth/fixExternalTypeschriseth2015-10-161-14/+11
|\ \ | | | | | | Do not include function in interface list if there are errors.
| * | Do not include function in interface list if there are errors.chriseth2015-10-161-14/+11
| |/
* / Do not catch InternalCompilerErrors as part of fatal error handling.chriseth2015-10-164-9/+15
|/ | | | InternalCompilerErrors always have to end the whole compilation process because a serious inconsistency was detected.
* Merge pull request #132 from chriseth/tupleExpressionchriseth2015-10-1620-105/+532
|\ | | | | Tuple expressions and destructuring assignments
| * Fixed indentation.chriseth2015-10-161-2/+3
| |
| * Some fixes taking other pull requests into account.chriseth2015-10-161-3/+2
| |
| * MacOS fix.chriseth2015-10-151-2/+2
| |
| * Fix compiler warnings.chriseth2015-10-151-1/+3
| |
| * Wildcards.chriseth2015-10-154-30/+29
| |
| * Destructuring assignments.chriseth2015-10-1510-100/+347
| |
| * Tuple expressions.chriseth2015-10-1514-17/+196
| |
* | Merge pull request #136 from LianaHus/sol_error_types_refuctoringchriseth2015-10-161-9/+3
|\ \ | |/ |/| changed the way of reporting error during contract checking
| * changed the way of reporting error during contract checkingLianaHus2015-10-161-9/+3
| |
* | Merge pull request #130 from LefterisJP/dynamic_array_pushchriseth2015-10-153-24/+95
|\ \ | |/ |/| Dynamic array push
| * push() for byte arrays also properly implementedLefteris Karapetsas2015-10-151-4/+6
| |
| * Working implementation of arraypushLefteris Karapetsas2015-10-151-12/+10
| | | | | | | | | | ByteArrayPush() gets a test but is ignored for now, since there are still some issues with its implementation
| * Implement Dynamic array push and fix testLefteris Karapetsas2015-10-153-17/+72
| | | | | | | | | | Still a work in progress. There is a disturbance in the stack at the moment and that's why there are some cout statements left for debugging.
| * WIP - Expression compiler for array pushLefteris Karapetsas2015-10-151-15/+31
| |
* | missing constLianaHus2015-10-152-2/+2
| |
* | indentLianaHus2015-10-151-2/+2
| |
* | added constLianaHus2015-10-152-4/+4
| |
* | some more style fixesLianaHus2015-10-155-21/+8
| |
* | style fixesLianaHus2015-10-152-16/+16
| |
* | style fixes mostlyLianaHus2015-10-154-18/+42
| |
* | removed commitLianaHus2015-10-151-1/+0
| |
* | mainly style fixes/renamingLianaHus2015-10-155-13/+13
| |
* | fixed new testsLianaHus2015-10-153-26/+62
| |
* | fixes error after conflict resolvingLianaHus2015-10-154-5/+3
| |
* | errors instead of exceptionsLianaHus2015-10-1510-155/+337
| | | | | | | | | | | | | | | | | | Conflicts: libsolidity/CompilerStack.cpp libsolidity/NameAndTypeResolver.cpp libsolidity/NameAndTypeResolver.h libsolidity/TypeChecker.cpp test/libsolidity/SolidityNameAndTypeResolution.cpp
* | some fixesLianaHus2015-10-153-4/+8
| |
* | added Error class for all kind of errorsLianaHus2015-10-1512-40/+89
| | | | | | | | | | Conflicts: libsolidity/Exceptions.h
* | added Error class for all kind of errorsLianaHus2015-10-151-3/+3
|/ | | | | | | | Conflicts: libsolidity/Exceptions.h Conflicts: libsolidity/ReferencesResolver.cpp
* Some further test fixes.chriseth2015-10-132-25/+35
|
* Some more tests and typos fixed.chriseth2015-10-132-3/+4
|
* Multi-variable declarations.chriseth2015-10-137-65/+107
|
* Introduced tuple type and added multi variable declarations to typechriseth2015-10-105-87/+184
| | | | checker.
* Refactoring to allow multi-variable declarations.chriseth2015-10-097-55/+120
|
* Check invalid integer constants for functions accepting arbitrary arguments.chriseth2015-10-081-4/+10
|
* Resolve binary dependencies properly.chriseth2015-10-076-20/+68
|
* Merge pull request #122 from chriseth/anonymousEventsWithFourIndexedParamschriseth2015-10-071-1/+3
|\ | | | | Allow four indexed arguments for anynomous events.
| * Allow four indexed arguments for anynomous events.chriseth2015-10-071-1/+3
| |
* | Merge pull request #118 from chriseth/rejectEtherSentToLibrarychriseth2015-10-071-0/+3
|\ \ | |/ |/| Reject ether sent to library.
| * Reject ether sent to library.chriseth2015-10-071-0/+3
| |
* | Fix boost error.chriseth2015-10-071-11/+12
|/
* Add const.chriseth2015-10-062-4/+4
|
* Compiler version stamp.chriseth2015-10-066-2/+59
|
* Add structs to library interface.chriseth2015-10-061-6/+29
|
* Provide access to scoped structs.chriseth2015-10-067-21/+45
|
* Compute canonical names of types for function signatures.chriseth2015-10-0612-39/+145
|
* Encode storage items correctly for library calls.chriseth2015-10-062-2/+10
|
* Tests apart from new one work fine.chriseth2015-10-067-38/+50
|
* Split external type into ecoding and interface type.chriseth2015-10-067-55/+128
|
* Store small byte arrays and strings in storage in one slot with theirchriseth2015-10-024-50/+229
| | | | length.
* -fixed the warning printingLianaHus2015-10-022-5/+6
| | | | -style fixes
* -added warning case to cl compilerLianaHus2015-10-021-1/+1
| | | | -modified warning msg
* removed unnecessary function declarationLianaHus2015-10-021-2/+0
|
* added warning for noninitialized references in storage.LianaHus2015-10-023-6/+26
|
* style fixesLianaHus2015-10-021-8/+16
|
* style fixesLianaHus2015-10-021-12/+31
|
* Bugfix in calldata unpacker.chriseth2015-10-012-33/+27
| | | | | The offset was not specified correctly if memory activity preceded the unpacker.
* Provide types for VariableDeclaration.chriseth2015-09-243-1/+15
|
* Merge pull request #95 from chriseth/styleCleanupchriseth2015-09-241-39/+95
|\ | | | | Style cleanup.
| * Style cleanup.chriseth2015-09-241-39/+95
| |
* | improved overflow check in memorySize for ArrayTypeLianaHus2015-09-241-3/+3
|/
* Merge pull request #91 from chriseth/literalStringsToStoragePointerchriseth2015-09-241-1/+3
|\ | | | | Literal strings to storage pointer
| * Do not allow assignment from literal strings to storage pointers.chriseth2015-09-231-1/+3
| | | | | | | | Fixes #90
* | improved the testLianaHus2015-09-231-2/+3
| |
* | style fixLianaHus2015-09-231-1/+0
| |
* | fixed-sized arrays as return typeLianaHus2015-09-234-10/+35
|/ | | | | Conflicts: test/libsolidity/SolidityEndToEndTest.cpp
* Merge pull request #85 from chriseth/warningschriseth2015-09-2330-1586/+2176
|\ | | | | Support mulitple errors and warnings.
| * Style fix.chriseth2015-09-221-1/+2
| |
| * Build fix for MacOS.chriseth2015-09-221-4/+4
| |
| * Error formatting.chriseth2015-09-224-36/+38
| |
| * Refactored annotations.chriseth2015-09-228-45/+186
| |
| * Refactoring: Check types outside of AST and recover from some errors.chriseth2015-09-2229-1587/+2035
| |
* | Merge pull request #87 from chriseth/fixVersionchriseth2015-09-231-2/+4
|\ \ | | | | | | Add libevmasm version string.
| * | Add libevmasm version string.chriseth2015-09-221-2/+4
| |/
* / fixed using string as a type for struct memberLianaHus2015-09-172-4/+7
|/
* Merge pull request #79 from arkpar/cmakeMarek Kotewicz2015-09-171-1/+1
|\ | | | | Per project versioning
| * per project versioningarkpar2015-09-161-1/+1
| |
* | styleLianaHus2015-09-161-6/+2
| |
* | style fixesLianaHus2015-09-163-5/+5
| |
* | throw statement implementationLianaHus2015-09-1613-1/+76
| |
* | removed unneccessary check from ExpresiionCompilerLianaHus2015-09-151-14/+0
| |
* | style fixesLianaHus2015-09-151-2/+3
| |
* | fixed conflict mergeingLianaHus2015-09-151-2/+2
| |
* | - changed implementationLianaHus2015-09-151-36/+53
| | | | | | | | | | | | | | - style fixes Conflicts: libsolidity/AST.cpp
* | Update ExpressionCompiler.cppLianaHus2015-09-151-1/+2
| | | | | | | | | | Conflicts: libsolidity/ExpressionCompiler.cpp
* | added compile time check for out of bounds access for ordinary arraysLianaHus2015-09-151-0/+14
| | | | | | | | | | | | | | todo: check for dynamicaly sized arrays Conflicts: libsolidity/ExpressionCompiler.cpp
* | Merge pull request #70 from chriseth/sol_libraries2chriseth2015-09-143-4/+20
|\ \ | |/ |/| Commandline interface for linker.
| * Commandline interface for the linker.chriseth2015-09-122-2/+15
| |
| * Small fixes to the type system concerning libraries.chriseth2015-09-111-2/+5
| |
* | Merge pull request #66 from chriseth/sol_librarieschriseth2015-09-1215-87/+159
|\| | | | | Calling libraries.
| * Style.chriseth2015-09-111-1/+2
| |
| * Possibility to call library functions.chriseth2015-09-114-18/+48
| |
| * Transition from bytecode to more general linker objects.chriseth2015-09-117-56/+68
| |
| * Parsing and type checking of libraries without inheritance.chriseth2015-09-116-13/+42
| |
* | Merge pull request #69 from LianaHus/sol_enum_too_many_indexed_argschriseth2015-09-111-2/+5
|\ \ | |/ |/| too many indexed arguments for event
| * add call for EventDefinition::checkTypeRequirements()LianaHus2015-09-111-2/+5
| |
* | Merge pull request #65 from LianaHus/sol_Creating_a_contract_from_within_itselfchriseth2015-09-112-3/+12
|\ \ | |/ |/| Added error when creating a contract from within itself
| * style fixesLianaHus2015-09-111-1/+1
| |
| * added type check if the type of the var decl is one of base contract typeLianaHus2015-09-102-3/+12
| |
* | - added tests to test empty commentLianaHus2015-09-102-4/+7
|/ | | | | - fixed skipSingleLineComment - some style fixes
* Stylistic corrections.chriseth2015-09-091-1/+1
|
* Fix for constant strings.chriseth2015-09-083-6/+28
|
* Merge pull request #41 from LianaHus/sol_rename_getterschriseth2015-09-0837-1418/+1444
|\ | | | | solidity interface changes. removing get prefix
| * - renamed AST to ast and ABI to abiLianaHus2015-09-087-16/+23
| | | | | | | | - style fixes
| * removed get prefixLianaHus2015-09-0811-37/+49
| | | | | | | | style fixes
| * renamed getter functionsLianaHus2015-09-0835-1391/+1398
| |
* | changes required to compile solidity in a single projectdebris2015-09-011-4/+1
|/
* Merge pull request #24 from LianaHus/sol_fix_error_checkGav Wood2015-08-271-1/+1
|\ | | | | added check for having type in VariableDeclaration::checkTypeRequirem…
| * added check for having type in VariableDeclaration::checkTypeRequirements()LianaHus2015-08-241-1/+1
| |
* | client refactordebris2015-08-271-4/+1
| |
* | Merge pull request #26 from arkpar/cmakeMarek Kotewicz2015-08-241-6/+3
|\ \ | |/ |/| Refactored CMakeLists for new module system
| * Refactoreed CMakeLists for new module systemarkpar2015-08-241-6/+3
| |
* | Merge pull request #22 from LianaHus/sol_accessors_for_const_state_varchriseth2015-08-225-4/+24
|\ \ | | | | | | fixed the issue with accessors for constant state variables
| * | add tests for state variables accessors. normal and constantLianaHus2015-08-215-4/+24
| |/ | | | | | | fixed the issue with accessors for constant state variables
* / Propagate exceptions in clone calls.chriseth2015-08-211-0/+3
|/
* Merge pull request #7 from chriseth/moreInfoForCommandlineOptionsGav Wood2015-08-201-1/+1
|\ | | | | More information for help screen, some fixes for argument parsing.
| * More information for help screen, some fixes for argument parsing.chriseth2015-08-201-1/+1
| |
* | Modularise CMakeLists files and integrate tests.chriseth2015-08-201-6/+6
|/
* include Version.h under libsolidityLefteris Karapetsas2015-08-191-1/+1
|
* Add CMakeLists.txt for libsolidityLefteris Karapetsas2015-08-1951-0/+18332
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-22 07:36:53 +0800