Commits · master · compilerconstructionWS16 / CUP Eclipse Plugin

25 Nov, 2016 12 commits
- Merge remote-tracking branch 'origin/clemens' · 9545fc93
  Clemens Pflaum authored Nov 25, 2016
```
Conflicts:
	CupParser/.classpath
	CupParser/src/de/in/tum/www2/cup/ast/CodeBlock.java
	CupParser/src/de/in/tum/www2/cup/ast/JavaCompiler.java
	CupParser/src/de/in/tum/www2/cup/ast/JavaParser.java
	CupParser/src/de/in/tum/www2/cup/ast/JavaSemantics.java
	CupReferencedLibraries/.classpath
	CupReferencedLibraries/META-INF/MANIFEST.MF
	CupReferencedLibraries/build.properties
```
  9545fc93
- Merge remote-tracking branch 'origin/clemens' into clemens · 8550a5ab
  Clemens Pflaum authored Nov 25, 2016
  
  8550a5ab
- fixed minor errors · 0810f729
  Clemens Pflaum authored Nov 25, 2016
  
  0810f729
- removed debug msg · 78b0b73f
  Konrad Pröll authored Nov 25, 2016
  
  78b0b73f
- Merge remote-tracking branch 'origin/konstantin2' into clemens · 293af80a
  Clemens Pflaum authored Nov 25, 2016
```
Conflicts:
	CupParser/src/de/in/tum/www2/cup/analysis/ParseJavaVisitor.java
	CupParser/src/de/in/tum/www2/cup/ast/ActionCodeBlock.java
	CupParser/src/de/in/tum/www2/cup/ast/CodeBlock.java
	CupParser/src/de/in/tum/www2/cup/ast/SpecialCodeBlock.java
```
  293af80a
- changed DamagerRepairer for javaCode, fixed memoryleak · 1d8ed856
  Clemens Pflaum authored Nov 25, 2016
  
  1d8ed856
- Merge remote-tracking branch 'origin/clemens' into konstantin2 · 1417b724
  baueko authored Nov 25, 2016
```
Conflicts:
	CupParser/src/de/in/tum/www2/cup/Demo.java
```
  1417b724
- added missing files · f670dfec
  baueko authored Nov 25, 2016
  
  f670dfec
- renamed JavaCompiler, added classpathentries to CupParser · 346b473d
  baueko authored Nov 25, 2016
  
  346b473d
- Added other missing files · 4026d34d
  Konrad Pröll authored Nov 25, 2016
  
  4026d34d
- Added missing file · af78bf6f
  Konrad Pröll authored Nov 25, 2016
  
  af78bf6f
- renamed NoopErrorReporter · a085e301
  Konrad Pröll authored Nov 25, 2016
  
  a085e301
24 Nov, 2016 5 commits
- Added some JavaDoc · f53a2c64
  Clemens Pflaum authored Nov 24, 2016
  
  f53a2c64
- Merge remote-tracking branch 'origin/konstantin2' into clemens · 3ef9eb3c
  Clemens Pflaum authored Nov 24, 2016
```
Conflicts:
	CupParser/src/de/in/tum/www2/cup/CupParser.java
	CupParser/src/de/in/tum/www2/cup/ast/ActionCodeBlock.java
	CupParser/src/de/in/tum/www2/cup/ast/CodeBlock.java
	CupParser/src/de/in/tum/www2/cup/ast/JavaCompiler.java
	CupParser/src/de/in/tum/www2/cup/ast/SpecialCodeBlock.java
```
  3ef9eb3c
- Java Syntax Highlighting v1.0 + beginnings of error Reporting · c40ae431
  Clemens Pflaum authored Nov 24, 2016
  
  c40ae431
- did some cleanup · ce773342
  baueko authored Nov 24, 2016
  
  ce773342
- changed parsing to Java 8 · baa12557
  baueko authored Nov 24, 2016
  
  baa12557
23 Nov, 2016 11 commits
- Merge remote-tracking branch 'origin/clemens' into konstantin2 · 39dcc956
  baueko authored Nov 23, 2016
```
Conflicts:
	CupReferencedLibraries/.classpath
```
  39dcc956
- classpath · 11fb0820
  baueko authored Nov 23, 2016
  
  11fb0820
- Merge remote-tracking branch 'origin/konstantin2' into clemens · b995ccb9
  Clemens Pflaum authored Nov 23, 2016
```
Conflicts:
	CupParser/src/de/in/tum/www2/cup/ast/ActionCodeBlock.java
	CupParser/src/de/in/tum/www2/cup/ast/CodeBlock.java
	CupParser/src/de/in/tum/www2/cup/ast/JavaCompiler.java
	CupPlugin/src/de/tum/in/www2/cupplugin/controller/DocumentDidChangeJob.java
```
  b995ccb9
- tried to fix classpathEntries · 1cbc1dec
  baueko authored Nov 23, 2016
  
  1cbc1dec
- Syntax Highlighting variables and methods · 898d1ae5
  Clemens Pflaum authored Nov 23, 2016
  
  898d1ae5
- renamed BindingCollector · 1384c957
  Clemens Pflaum authored Nov 23, 2016
  
  1384c957
- Merge + gather method and variable bindings · 6bee99ef
  Clemens Pflaum authored Nov 23, 2016
```
Merge remote-tracking branch 'origin/konstantin2' into clemens

Conflicts:
	CupParser/src/de/in/tum/www2/cup/Demo.java
	CupParser/src/de/in/tum/www2/cup/ast/JavaCompiler.java
```
  6bee99ef
- Added Missing files · 0d6938cd
  Clemens Pflaum authored Nov 23, 2016
  
  0d6938cd
- Detect all variable positions and save to HashMap · 4a71f35c
  Clemens Pflaum authored Nov 23, 2016
  
  4a71f35c
- added classpathEntries for java parsing · 5573cba4
  baueko authored Nov 23, 2016
  
  5573cba4
- did some cleanup · 3730f3c9
  baueko authored Nov 23, 2016
  
  3730f3c9
22 Nov, 2016 9 commits
- added return type and auto generated variables to java-ast, did some · b27412cb
  baueko authored Nov 22, 2016
```
cleanup
```
  b27412cb
- fixed classpath · 3a740c2a
  Konrad Pröll authored Nov 22, 2016
  
  3a740c2a
- resolved bindings · 1bb3ec41
  Konrad Pröll authored Nov 22, 2016
  
  1bb3ec41
- added missing file · 9938f086
  baueko authored Nov 22, 2016
  
  9938f086
- added visitors for java parsing · ddedca0e
  baueko authored Nov 22, 2016
  
  ddedca0e
- fixed manifest · 3c19aa31
  baueko authored Nov 22, 2016
  
  3c19aa31
- removed reference to javaSymbol and old javaScanner · 701ae595
  Clemens Pflaum authored Nov 22, 2016
  
  701ae595
- Removed onefiveLexer Java · 1452b712
  Clemens Pflaum authored Nov 22, 2016
  
  1452b712
- Syntax highlighting · dfc2c545
  Clemens Pflaum authored Nov 22, 2016
  
  dfc2c545
17 Nov, 2016 3 commits
- fixed libraries · e0d615ec
  baueko authored Nov 17, 2016
  
  e0d615ec
- removed Mouse and XMLElements, added eclipse ast visitor for variable · 6d421bde
  baueko authored Nov 17, 2016
```
declarations 
```
  6d421bde
- Added Eclipse AST · 377feea8
  Konrad Pröll authored Nov 17, 2016
  
  377feea8