Commit graph

1706 commits

Author SHA1 Message Date
Stefan Oehme
69093080fc introduce AbstractGenerator and IGeneratorContext 2015-10-23 10:26:37 +02:00
Sven Efftinge
d7285f5ec6 [wizard] added missing dependencies and improved toString for EclipseProjectConfig 2015-10-22 22:43:22 +02:00
Sebastian Zarnekow
4a2a2525e0 [480445] Added TypeReference#guessTypeRef
Improved backwards compatibility.
2015-10-22 19:02:54 +02:00
Sebastian Zarnekow
25c3978d98 [480436] Fixed bug in GrammarFlattener 2015-10-22 18:14:19 +02:00
Stefan Oehme
b542ba8e06 Merge pull request #723 from eclipse/so_generator2
IGenerator2 improvements
2015-10-22 17:57:21 +02:00
Stefan Oehme
a7c983cb21 Merge pull request #722 from eclipse/so_generator_maven_dependencies
[generator2][wizard] only depend on new generator in new projects
2015-10-22 17:57:13 +02:00
Stefan Oehme
d55b5a4bde fix wizard integration test 2015-10-22 16:44:28 +02:00
Stefan Oehme
75e304e304 [generator2][wizard] only depend on new generator in new projects 2015-10-22 16:05:34 +02:00
Stefan Oehme
07cdb06281 [wizard] add a utility to update test expectations 2015-10-22 15:55:22 +02:00
Stefan Oehme
7dfaaf17d8 Bug 477068 generator2 should expose a CancelIndicator 2015-10-22 14:10:02 +02:00
Sven Efftinge
4a43c1aaa9 updated test expectations 2015-10-22 12:40:54 +02:00
Stefan Oehme
37218795e8 remove brittle nested class detection magic from TypeReference 2015-10-21 16:17:53 +02:00
Stefan Oehme
21dd488f2c Merge pull request #716 from sailingKieler/cs/codeConfigEncodingLineDelim
[xtext generator] added default value of 'encoding' and 'lineDelimiter' in CodeConfig
2015-10-21 14:49:04 +02:00
Dennis Huebner
ea1ad3a21b [wiz] Updated generated TP to mars sr1 + mwe2 2.8,1
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-10-21 14:36:26 +02:00
Dennis Huebner
e3898c1477 Bug 480097 - [generator] Xtext 2.9 Maven build failed (edit)
https://bugs.eclipse.org/bugs/show_bug.cgi?id=480097
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-10-21 14:03:36 +02:00
Christian Schneider
3b6fbab23b [xtext generator] added default value of 'encoding' and 'lineDelimiter' in CodeConfig, removed pre-setting from workflow template in RuntimeProjectDescriptor
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-10-21 11:48:07 +02:00
Sebastian Zarnekow
7667467a0c Merge branch 'master' into me/serializer 2015-10-21 10:37:59 +02:00
Stefan Oehme
ea92173b37 Merge pull request #700 from sailingKieler/aa/grammarComparison
Contribution of 'XtextAntlrGeneratorComparisonFragment' + '...Test'
2015-10-21 08:48:35 +02:00
Sebastian Zarnekow
24845d80a5 Merge branch 'master' into me/serializer 2015-10-20 19:09:10 +02:00
Stefan Oehme
df288afc65 fix Bug 480196 2015-10-20 14:37:15 +02:00
Christian Schneider
34576c8da3 [antlr grammar comparison] more refactoring and polishing in the grammar comparison classes
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-10-20 14:27:25 +02:00
Sebastian Zarnekow
2f14516fad [479400] Fixed broken tests and improved Xtext serializer 2015-10-20 13:48:56 +02:00
Stefan Oehme
498ad15dae move project config to its own package 2015-10-20 12:04:19 +02:00
Stefan Oehme
99c0195998 more consistent naming of Generator2 concepts 2015-10-20 11:49:05 +02:00
Sebastian Zarnekow
36c8bbaa8e Merge branch 'master' into me/serializer 2015-10-20 11:38:12 +02:00
Christian Schneider
9b91477282 [antlr grammar comparator] renamed error handler's method 'handleUnexpectedCharSequence' into 'handleInvalidGrammarFile'
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-10-20 11:35:46 +02:00
Christian Schneider
3ce87a3372 [xtext generator] fixed mistakes caused by the merge and in logic of 'AntlrGrammarComparator', comparisonFragment, and 'AntlrGrammarComparatorTest'
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-10-20 10:01:06 +02:00
Sebastian Zarnekow
51bf8f2298 Merge pull request #704 from eclipse/sz/bug480118
[480118] Fixed regression in new grammar access fragment
2015-10-20 09:54:38 +02:00
Stefan Oehme
095ea42b64 [wizard] fix UI tests on mac 2015-10-20 09:23:47 +02:00
Moritz Eysholdt
7cfe0838fc Fixed serialization problem of Xtext.xtext grammar
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-10-20 00:57:58 +02:00
Moritz Eysholdt
ba31590e76 [serializer] several fixes
- pass ParserRule-Parameters to Action-based contexts
- fixed an issue with constraint names that could cause duplicate 
  Java method names in the Semanitc Sequencer
- improved names of serialization contexts

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-10-19 23:55:47 +02:00
Sebastian Zarnekow
b870a30ae6 [480118] Fixed regression in new grammar access fragment
Not all valid java identifiers are valid in Antlr
action contexts.
2015-10-19 18:25:30 +02:00
Stefan Oehme
1c750ea53e [wizard] fix test expectations 2015-10-19 17:13:13 +02:00
Stefan Oehme
8e0e6dfe88 only tycho builds need generator dependencies in the exec-plugin 2015-10-19 16:49:18 +02:00
Christian Schneider
5106898fb2 Merge remote-tracking branch 'origin/master' into genFrag/grammarComparison
Conflicts:
	plugins/org.eclipse.xtend.core/src/org/eclipse/xtend/core/GenerateXtend.mwe2
	plugins/org.eclipse.xtext.xbase/generator/org/eclipse/xtext/xbase/GenerateXbase.java

manually fixed
2015-10-19 16:11:54 +02:00
Christian Schneider
fd63485f22 [xtext generator] refactored 'XtextAntlrGeneratorComparisonFragment' as requested in review
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-10-19 16:04:06 +02:00
Christian Schneider
c1c81484b6 [xtext tests] Contributed initial draft of 'XtextAntlrGeneratorComparisonFragmentTest'
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>

Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-10-19 10:29:45 +02:00
Moritz Eysholdt
b76dcad4c4 Added a test case for a problem when serializing Xtext.xtext
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-10-16 18:34:34 +02:00
Moritz Eysholdt
c5f8c186e8 [serializer] improve support for parameterized rule calls
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-10-16 17:30:59 +02:00
Moritz Eysholdt
c3ddd09442 [serializer] removed non-API-methods from ISerializationContext
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-10-16 17:02:56 +02:00
Moritz Eysholdt
2ee177b976 [Serializer] renamed IContext to ISerializationContext and made it API 2015-10-16 17:02:56 +02:00
Moritz Eysholdt
839ef90393 [JavaFormatting] set max line width to 140 chars 2015-10-16 17:02:56 +02:00
Moritz Eysholdt
d86e9e6442 hooked the FlattenedGrammarAccess before the serializer
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-10-16 17:02:54 +02:00
Moritz Eysholdt
8e07bfdca6 [serializer] introduce IContext
Previously, the context was of type EObject which actually was a
ParserRule or assigned Action. 

This refactoring paves the road for more advanced contexts, such
as ParserRules with parameter values.

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-10-16 17:02:53 +02:00
Miro Spönemann
76882898d6 [generator] Implemented adapter for using the new generator in old fragments,
removed implementation of old serializer fragment

Signed-off-by: Miro Spönemann <miro.spoenemann@itemis.de>
2015-10-16 08:19:29 +02:00
Sven Efftinge
1fd8c0bd62 [wizard] fixed broken test expectations 2015-10-15 11:15:13 +02:00
Stefan Oehme
e9d2791194 Merge pull request #687 from eclipse/sz/testProjectNames
[wizard] Fixed test project names with mvn config
2015-10-15 10:15:05 +02:00
Sven Efftinge
0b64acd1fa [generator] Simpler language generator configuration for the standard case 2015-10-15 09:19:14 +02:00
Sebastian Zarnekow
16ebeaa4d8 [wizard] Fixed test project names with mvn config
Also:
- adjusted orion download URI in example
- updated gradle preferences
2015-10-14 17:17:04 +02:00
Christian Schneider
af8d206769 [xtext generator] Migration of 'ResourceFactoryFragment'
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-10-14 13:41:57 +02:00