Commit Graph

381 Commits

Author SHA1 Message Date
Christian
26f554d0d8 Merge remote-tracking branch 'ethereum/develop' into sol_import
Conflicts:
	libsolidity/CompilerStack.cpp
	libsolidity/CompilerStack.h
	libsolidity/InterfaceHandler.cpp
	libsolidity/InterfaceHandler.h
	solc/main.cpp
	test/solidityJSONInterfaceTest.cpp
	test/solidityNatspecJSON.cpp
2014-12-08 12:07:17 +01:00
debris
c7cf8c6db4 solidity compiling under msvc && boosts cmake file fixed 2014-12-07 11:29:38 +01:00
Christian
d25d98a260 Comments and braces. 2014-12-07 09:46:21 +01:00
Marek Kotewicz
2d8eaf8482 Merge branch 'develop' into build_enhancement 2014-12-06 17:34:50 +01:00
debris
53e0ff10f5 solidity compiling on windows, fixed Compiler Error C2797 2014-12-05 17:00:26 +01:00
Lefteris Karapetsas
407f11ba76 Replacing old cstyle enums with c++11 enums in natspec 2014-12-05 15:50:39 +01:00
Christian
25273778dc Renamed url to identifier and added some comments. 2014-12-05 15:35:05 +01:00
Christian
d4a958e1fe Merge remote-tracking branch 'ethereum/develop' into sol_import
Conflicts:
	libsolidity/CompilerStack.cpp
	libsolidity/CompilerStack.h
	solc/main.cpp
2014-12-05 15:27:07 +01:00
Lefteris Karapetsas
c8f96589c5 Stack compiler now correctly returns a string and not a pointer 2014-12-05 12:41:32 +01:00
Lefteris Karapetsas
27ef18865d Newline right after doctag is now a valid natspec entry
- Plus tests for that
2014-12-05 12:27:18 +01:00
Lefteris Karapetsas
11cac68cf4 Introducing Docstring parsing error exception and style fixes 2014-12-05 12:08:26 +01:00
Lefteris Karapetsas
8f6656f1b8 Using iterators in Natspec comment parsing
- Used iterators in the entirety of the InterfaceHandler natspec comment
  parsing pipeline

- Fixed issue where @param continuing in new line would not get a space
2014-12-05 02:10:54 +01:00
Lefteris Karapetsas
dedd1a312b Addressing styling and miscellaneous issue with Natspec 2014-12-04 23:55:47 +01:00
Lefteris Karapetsas
02a04eef5c Natspec @return tag parsing
- Also omitting tags from the output JSON file if they are missing
  instead of providing an empty string for their value
2014-12-04 18:12:52 +01:00
Lefteris Karapetsas
df4db1de07 Merge branch 'develop' into natspec_export_json 2014-12-04 17:28:46 +01:00
Lefteris Karapetsas
05964375f8 Natspec parsing @param doctags
- Plus additional work on generally parsing doctags.
  One important missing feature is to parse a tag midline

- Adding more tests
2014-12-04 17:19:47 +01:00
Marek Kotewicz
fa43a0ee95 removed automocs 2014-12-04 09:55:54 +01:00
Lefteris Karapetsas
3e803b40e1 Parsing notice and dev doxytags.
- Only initial work done. Still need to refine the logic and
  incorporate all the other types of tags.

- Added/Modified some tests

- Work in progress
2014-12-04 09:42:38 +01:00
Lefteris Karapetsas
ba27dc7421 Styling in libsolidity's InterfaceHandler 2014-12-04 01:27:38 +01:00
Christian
d2cf345483 Improved external interface for multi-source and multi-contract compilation. 2014-12-03 18:52:28 +01:00
Christian
254df50fea Multi-source and multi-contract compiler. 2014-12-03 18:51:59 +01:00
Lefteris Karapetsas
a0ff2179d4 Work in progress for parsing natspec doxytags 2014-12-03 17:46:04 +01:00
Lefteris Karapetsas
d25581de7c Moving all Interface and Documentation functionality to own class
- Creating the Interface Handler class which will take care of the
  parsing of Natspec comments and of interfacing with and outputing to
  JSON files.

- Will also handle the ABI interface creation
2014-12-03 16:40:37 +01:00
Lefteris Karapetsas
be81981ec4 Separate user and dev natspec documentation
- plus other small changes according to the spec
2014-12-03 13:50:04 +01:00
Christian
328387d6d0 Import directive. 2014-12-03 10:44:46 +01:00
Christian
9dadeea377 Remove std::. 2014-12-03 10:42:04 +01:00
Gav Wood
5af545d47d Merge pull request #547 from chriseth/sol_scannercleanup
Cleanup of scanner.
2014-12-03 10:15:42 +01:00
Gav Wood
f29e930f41 Merge pull request #549 from chriseth/sol_saveScope
Disallow assignments to structs and mappings
2014-12-03 10:15:11 +01:00
Christian
7b54d957d8 Comments for the TOKEN_LIST usage. 2014-12-03 09:41:12 +01:00
chriseth
9cfccd1826 Merge pull request #554 from chriseth/sol_constantOptimizer
Solidity optimizer for literal numbers
2014-12-03 08:30:48 +01:00
Gav Wood
71ae1f8f00 Warnings fixes (well.. the UPnP was actually a crash fix.) 2014-12-02 20:18:01 +01:00
Christian
24f3a4a2ea Fix: Storage offset of first struct member should be zero. 2014-12-02 17:58:44 +01:00
Lefteris Karapetsas
06998aa2d2 Simplifying lambda function in CompilerStack::getInterface() 2014-12-02 17:18:09 +01:00
Lefteris Karapetsas
af9fb9917c Removing unneeded local variable in CompilerStack::getDocumentation() 2014-12-02 12:14:24 +01:00
Lefteris Karapetsas
0d3ab07ad1 Handle absence of Natspec doc and add option to solc 2014-12-02 11:03:34 +01:00
Lefteris Karapetsas
e411449219 More Natspec JSON export tests and better error reporting 2014-12-02 10:41:18 +01:00
Lefteris Karapetsas
0f79ed6957 Using jsoncpp for exporting ABI interface from solidity
- Also changing the interface JSON test to have a shorter name
  plus to provide meaningful error message in case of failure
2014-12-01 18:01:42 +01:00
Christian
a2ad47441e Disallow assignments to structs and mappings. 2014-12-01 17:33:21 +01:00
Christian
9e91596c8d Save the scope for every declaration. 2014-12-01 17:33:21 +01:00
Lefteris Karapetsas
43d6726dd7 Exporting Natspec documentation to a JSON interface
- Adding a getDocumentation() function to solidity compiler stack
  so that we can obtain the natspec interface for a contract

- Adding libjsoncpp as a dependency of libsolidity. This is done
  in a dirty way, using libjsonrpc-cpp s an intermediate dependency
  for the moment. Will fix soon.

- Start of a test file for Natspec exporting to JSON
2014-12-01 17:03:04 +01:00
Christian
b685735b3a Cleanup of scanner.
Removed redundancy of keyword definitions and removed some unused token
predicates.
2014-12-01 13:46:04 +01:00
chriseth
3fc2708d65 Merge pull request #545 from LefterisJP/sol_com_in_ast
Solidity function AST nodes get documentation attribute
2014-12-01 12:43:32 +01:00
Lefteris Karapetsas
4b84507310 simplifying Scanner::reset() 2014-12-01 01:05:55 +01:00
Lefteris Karapetsas
21fdd84c09 Moving LiteralScope to Scanner.cpp 2014-11-30 23:25:42 +01:00
Lefteris Karapetsas
a595464739 Simplifying scanning for natspec documentation
- Scanner no longer remembers the last natspect comment until
  a new one is encountered. It remembers it only until the next
  scan()
2014-11-30 22:43:40 +01:00
Gav Wood
4b0d949df3 Warning fix.
ECDSA recover fix.
2014-11-28 14:28:02 +01:00
Lefteris Karapetsas
db7b118ece Solidity natspec docstring test improvements
- Adding a test for docstring being between function signature and
  function body

- Properly checking for exceptions in parsing

- Small parser fix
2014-11-28 11:17:18 +01:00
Lefteris Karapetsas
e3e90c4e6b Solidity FunctionDefinition used ASTString shared ptr for docstrings 2014-11-28 01:26:37 +01:00
Lefteris Karapetsas
034870b4c0 Fixing multiline comment parsing in solidity 2014-11-28 00:06:38 +01:00
Lefteris Karapetsas
e11e651929 Solidity work for documentation strings
- Still a work in progress

- Parser now properly gets each function's doc comment

- Small changes in the scanner

- Multiline comments are considered
2014-11-27 18:57:50 +01:00