Projects >> swp-uebersetzerbau-ss12 >>d6bd6cab4d9ae30d3adc14ed0895e00961b9a6b0

Chunk
Conflicting content 
import tokenmatcher.StatePayload;
import tokenmatcher.Token;
import tokenmatcher.Tokenizer;
<<<<<<< HEAD
import utils.Notification;
=======
import tokenmatcher.attributes.StringAttribute;
>>>>>>> eed8f859c80242eb2ed5dd519a15a2cf19b04149


public class RegexToDfaTest {
Solution content 
import tokenmatcher.StatePayload;
import tokenmatcher.Token;
import tokenmatcher.Tokenizer;
import utils.Notification;
import tokenmatcher.attributes.StringAttribute;


public class RegexToDfaTest {
File
RegexToDfaTest.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
		Notification.enableDebugPrinting();
		
		FiniteStateMachine fsm = new RegexToDfaConverter()
<<<<<<< HEAD
				.convert( "<=|<>|<<|<", new regextodfaconverter.fsm.StatePayload( "OP", "LE"));
=======
				.convert( "(a|b)*abb", new regextodfaconverter.fsm.StatePayload( "OP", new StringAttribute( "LE")));
>>>>>>> eed8f859c80242eb2ed5dd519a15a2cf19b04149

		LexemeReader lexemeReader = new BufferedLexemeReader( "src/test/resources/source/tokenmatcher/testrelop.fun");// new
																																						// SimpleLexemeReader(
Solution content 
		Notification.enableDebugPrinting();
		
		FiniteStateMachine fsm = new RegexToDfaConverter()
		.convert( "a.a+a*", new regextodfaconverter.fsm.StatePayload( "OP", new StringAttribute( "LE")));
			//	.convert( "<=|<>|<<|<", new regextodfaconverter.fsm.StatePayload( "OP", new StringAttribute( "LE")));
			//	.convert( "(a|b)*abb", new regextodfaconverter.fsm.StatePayload( "OP", new StringAttribute( "LE")));

		LexemeReader lexemeReader = new BufferedLexemeReader( "src/test/resources/source/tokenmatcher/testrelop.fun");// new
																																						// SimpleLexemeReader(
File
RegexToDfaTest.java
Developer's decision
Manual
Kind of conflict
Method invocation