Commit Graph

225 Commits

Author SHA1 Message Date
Christian Kamm
16542241c9 C++: Add parsing of Q_PRIVATE_PROPERTY.
Reviewed-by: Roberto Raggi
2011-01-04 15:58:22 +01:00
con
b1bcf081d8 Merge branch '2.1'
Conflicts:
	src/plugins/coreplugin/basemode.cpp
	src/plugins/coreplugin/basemode.h
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h
	src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp
	src/plugins/debugger/debuggeragents.cpp
	src/plugins/debugger/debuggeruiswitcher.cpp
	src/plugins/debugger/debuggeruiswitcher.h
	src/plugins/projectexplorer/buildconfigdialog.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.h
	src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h
	src/plugins/qmldesigner/designercore/include/modelutilities.h
	src/plugins/qmldesigner/designercore/include/nodeinstance.h
	src/plugins/qmldesigner/designercore/include/propertymetainfo.h
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h
	src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h
	src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h
	src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp
	src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp
	src/plugins/qmldesigner/designercore/model/modelutilities.cpp
	src/plugins/snippets/inputwidget.cpp
	src/plugins/snippets/snippetscompletion.cpp
	src/plugins/snippets/snippetscompletion.h
	src/plugins/snippets/snippetspec.cpp
	src/plugins/snippets/snippetsplugin.cpp
	src/plugins/snippets/snippetswindow.cpp
	src/plugins/snippets/snippetswindow.h
	src/plugins/texteditor/snippetsparser.cpp
	src/tools/qml/qmldom/main.cpp
	tests/manual/trk/runner.cpp
	tests/manual/trk/trkolddevice.cpp
	tests/manual/trk/trkolddevice.h
	tests/manual/trk/trkserver.cpp
2010-12-17 17:00:53 +01:00
con
04e32b0049 License headers. 2010-12-17 16:03:42 +01:00
Roberto Raggi
88fe5a50a1 Added semantic checks for stray semicolons and topldevel empty declarations. 2010-12-16 12:26:12 +01:00
Erik Verbruggen
192ca70649 C++ Parser: fix infinite loop when recovering from incorrect @selector expression. 2010-10-08 13:15:21 +02:00
Erik Verbruggen
5a1924f1a0 C++: fixed invalid parsing of 'call()->call()'. 2010-09-15 16:43:49 +02:00
Erik Verbruggen
6e51fffd22 C++: Fix: disallow empty nested declarators, it's invalid. 2010-09-15 16:19:27 +02:00
Roberto Raggi
c3b816166f Fixed parsing of sizeof expressions. 2010-09-09 17:38:40 +02:00
Roberto Raggi
52786e1e39 Improved parsing of expression-or-declaration statements.
Done-with: Erik Verbruggen
2010-09-09 17:11:57 +02:00
Roberto Raggi
b4c8c021e4 Fixed warning when passing the declaringClass. 2010-08-27 16:47:49 +02:00
Roberto Raggi
8131ff2df7 Reduced the number of ambiguous C++ initializers. 2010-08-26 17:15:01 +02:00
Roberto Raggi
688d382ad9 Some cleanup in the C++ AST. 2010-08-26 16:07:14 +02:00
Roberto Raggi
5533fbbf6b Prefer declaration statements. 2010-08-26 12:53:28 +02:00
Roberto Raggi
5c7909681b Get rid of the old Parser::parseExpressionOrDeclarationStatement(). 2010-08-26 12:23:57 +02:00
Roberto Raggi
e3551684ee Pass the enclosing ClassSpecifierAST node. 2010-08-26 12:06:32 +02:00
Roberto Raggi
d0f794b65e Reduced the number of ambiguous ExpressionOrDeclarationStatementAST nodes. 2010-08-26 10:31:15 +02:00
Roberto Raggi
2d683cd2c3 Renamed DeclaratorAST::equals_token 2010-08-16 11:38:34 +02:00
Roberto Raggi
ad322e9b17 Generate AST nodes for the bit fields. 2010-08-12 15:15:00 +02:00
Roberto Raggi
efb600665d Remember the T_TEMPLATE token we use to force the parser to recognize a template-id. 2010-08-12 12:29:12 +02:00
Thiago Macieira
740aadb7cd Compile with Intel CC: va_copy isn't defined.
This looks like a compiler bug. Intel CC uses the GCC headers, but
they appear to be incompatible. Bug will be reported, but meanwhile
work around the problem.

Reviewed-By: Trust Me
2010-08-11 21:14:53 +02:00
Tobias Hunger
2106ffedc3 Really fix compile now. 2010-08-11 16:10:21 +02:00
Tobias Hunger
afa0736783 Build fix on windows 2010-08-11 16:08:30 +02:00
Roberto Raggi
8a32c41f6f Removed TemplateArgumentList 2010-08-11 15:25:20 +02:00
Roberto Raggi
5248bdee70 Added warning(), error, and fatal() to Parser.cpp 2010-08-11 15:25:17 +02:00
Roberto Raggi
6324bf4460 Introduced IdExpressionAST. 2010-08-02 12:52:12 +02:00
Erik Verbruggen
42e34d6cd2 Removed debug output. 2010-07-29 14:15:11 +02:00
Erik Verbruggen
8a62bc455e Changed parser debug output to include token ahead. 2010-07-29 12:11:54 +02:00
Roberto Raggi
fea6c1cf8c Renamed LambdaCapture::default_capture. 2010-06-23 14:42:59 +02:00
Roberto Raggi
da817310c2 Get rid of PostfixExpressionAST and store the base expression together with the PostfixAST nodes. 2010-06-23 14:39:14 +02:00
Erik Verbruggen
708720605d Suppress false positives generated by some code-checking tools. 2010-06-04 11:15:38 +02:00
Roberto Raggi
283019a44a Fixed possible crash when parsing template declarations at the end of a C++ file. 2010-05-31 16:01:27 +02:00
Erik Verbruggen
25d7933d7a Fixed __attribute__ parsing after struct declarations.
Task-number: QTCREATORBUG-1358
Reviewed-by: Roberto Raggi
2010-05-27 14:22:53 +02:00
Roberto Raggi
a4245c174a Improved recovering from errors inside template declarations. 2010-05-25 17:15:21 +02:00
Roberto Raggi
ec5b235fbe Disabled parsing of C++0x initializer-list. 2010-05-21 10:51:09 +02:00
Erik Verbruggen
25837759ea Fix left-overs from merging icheck code. 2010-04-23 15:25:22 +02:00
Erik Verbruggen
fcedcc510a Handle fully qualified types in the root namespace for template typenames.
For example:
    template <typename ::foo::bar>...

Done by: Roberto Raggi
Reviewed-by: erikv
2010-04-12 13:06:24 +02:00
Roberto Raggi
4d45740167 Fixed parsing of anonymous template parameters.
For example,
  template <template <typename> class X> struct foo {};

Reviewed-by: erikv
2010-04-12 12:59:02 +02:00
Roberto Raggi
c3d7928ac8 Clone the TemplateArguments before caching the result. 2010-03-30 12:35:00 +02:00
Roberto Raggi
bbdb7d9742 Fixed parsing ambiguity when parsing dependant template types. 2010-03-29 14:10:42 +02:00
Roberto Raggi
f5c9a158c1 Use the start of the template-argument as to key for template-arguments cache. 2010-03-26 11:27:22 +01:00
Roberto Raggi
fe261bc256 Parse C++ 0x argument packs. 2010-03-25 12:16:18 +01:00
Roberto Raggi
3c8d12562e Recognize C++0x sizeof... expressions. 2010-03-25 10:44:42 +01:00
Roberto Raggi
ddcc40d0fc Accepts `...' when parsing declarator-ids in C++0x. 2010-03-25 10:44:42 +01:00
Roberto Raggi
86c2367c26 In C++ 0x auto is a type specifier. 2010-03-24 17:19:54 +01:00
Roberto Raggi
cf125618af Accepts trailing return types. 2010-03-24 14:56:45 +01:00
Roberto Raggi
4e50dfe330 Require a T_EQUAL when parsing conditions. 2010-03-24 13:56:34 +01:00
Roberto Raggi
8329d7db94 Recognize C++0x lambda expressions. 2010-03-24 13:49:02 +01:00
Roberto Raggi
0eddf5c0ad Accept C++0x initializers. 2010-03-23 14:17:33 +01:00
Erik Verbruggen
989681a0e9 Added attribute parsing for elaborate-type-specifiers. 2010-03-23 14:15:45 +01:00
Roberto Raggi
189ec382ef Recognize C++0x type-id-list. 2010-03-23 14:13:23 +01:00