| Chunk |
|---|
| Conflicting content |
|---|
private void emitClassCode() {
<<<<<<< HEAD
if ( scanner.eofCode != null ) {
println(" /** denotes if the user-EOF-code has already been executed */");
//println(" private boolean zzEOFDone;");
println(" "+Options.lang.field(false, false, true, Options.lang.boolean_type(), "zzEOFDone", "false"));
println("");
}
=======
>>>>>>> 43cae43befd9e5070e08281db130eeb819f3a300
if ( scanner.classCode != null ) {
println(" /* user code: */");
println(scanner.classCode); |
| Solution content |
|---|
private void emitClassCode() {
if ( scanner.eofCode != null ) {
println(" /** denotes if the user-EOF-code has already been executed */");
//println(" private boolean zzEOFDone;");
println(" "+Options.lang.field(false, false, true, Options.lang.boolean_type(), "zzEOFDone", "false"));
println("");
}
if ( scanner.classCode != null ) {
println(" /* user code: */");
println(scanner.classCode); |
| File |
|---|
| Emitter.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| If statement |
| Chunk |
|---|
| Conflicting content |
|---|
//---------------------------------------------------- <<<<<<< HEAD // The following code was generated by CUP v0.11a beta 20060608 // Wed May 28 19:17:47 EST 2008 ======= // The following code was generated by CUP v0.10k // Tue May 27 20:22:19 EST 2008 >>>>>>> 43cae43befd9e5070e08281db130eeb819f3a300 //---------------------------------------------------- package JFlex; |
| Solution content |
|---|
//---------------------------------------------------- // The following code was generated by CUP v0.10k // Tue May 27 20:22:19 EST 2008 //---------------------------------------------------- package JFlex; |
| File |
|---|
| LexParse.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Comment |
| Chunk |
|---|
| Conflicting content |
|---|
import java.util.*;
<<<<<<< HEAD
/** CUP v0.11a beta 20060608 generated parser.
* @version Wed May 28 19:17:47 EST 2008
=======
/** CUP v0.10k generated parser.
* @version Tue May 27 20:22:19 EST 2008
>>>>>>> 43cae43befd9e5070e08281db130eeb819f3a300
*/
public class LexParse extends java_cup.runtime.lr_parser {
|
| Solution content |
|---|
import java.util.*;
/** CUP v0.10k generated parser.
* @version Tue May 27 20:22:19 EST 2008
*/
public class LexParse extends java_cup.runtime.lr_parser {
|
| File |
|---|
| LexParse.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Comment |
| Chunk |
|---|
| Conflicting content |
|---|
<<<<<<< HEAD /* The following code was generated by JFlex 1.4.2 on 5/28/08 7:17 PM */ ======= /* The following code was generated by JFlex 1.4.3 on 5/27/08 8:22 PM */ >>>>>>> 43cae43befd9e5070e08281db130eeb819f3a300 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * JFlex 1.4.3 * |
| Solution content |
|---|
/* The following code was generated by JFlex 1.4.3 on 5/27/08 8:22 PM */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * JFlex 1.4.3 * |
| File |
|---|
| LexScan.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Comment |
| Chunk |
|---|
| Conflicting content |
|---|
public class Main {
/** JFlex version */
<<<<<<< HEAD
final public static String version = "1.4.2 (+scala)"; //$NON-NLS-1$
=======
final public static String version = "1.4.3"; //$NON-NLS-1$
>>>>>>> 43cae43befd9e5070e08281db130eeb819f3a300
/**
* Generates a scanner for the specified input file. |
| Solution content |
|---|
public class Main {
/** JFlex version */
final public static String version = "1.4.3 (+scala)"; //$NON-NLS-1$
/**
* Generates a scanner for the specified input file. |
| File |
|---|
| Main.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Attribute |
| Comment |
| Chunk |
|---|
| Conflicting content |
|---|
//---------------------------------------------------- <<<<<<< HEAD // The following code was generated by CUP v0.11a beta 20060608 // Wed May 28 19:17:47 EST 2008 ======= // The following code was generated by CUP v0.10k // Tue May 27 20:22:19 EST 2008 >>>>>>> 43cae43befd9e5070e08281db130eeb819f3a300 //---------------------------------------------------- package JFlex; |
| Solution content |
|---|
//---------------------------------------------------- // The following code was generated by CUP v0.10k // Tue May 27 20:22:19 EST 2008 //---------------------------------------------------- package JFlex; |
| File |
|---|
| sym.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Comment |