Projects >> sveditor >>c7163de2dbd4dc45bbc3cd3f51bd3c3f9c1fde49

Chunk
Conflicting content
		parent.addChildItem(gen_blk);

		if (fLexer.peekKeyword("begin")) {
<<<<<<< HEAD
			gen_begin_end(gen_blk);
=======
			fLexer.eatToken();
			if (fLexer.peekOperator(":")) {
				fLexer.eatToken();
				gen_blk.fName = "for: " + fLexer.readId();
			}
			// Can have a random begin / end around the contents of the code
			if (fLexer.peekKeyword("begin"))  {
				nested_begin = true;
				fLexer.readKeyword("begin");
			}
			while (fLexer.peek() != null && !fLexer.peekKeyword("end")) {
				fParsers.modIfcBodyItemParser().parse(gen_blk, "for");
			}
			// Get the end if it exists
			if (nested_begin)  {
				fLexer.readKeyword("end");
			}
			fLexer.readKeyword("end");
			if (fLexer.peekOperator(":")) {
				fLexer.eatToken();
				fLexer.readId();
			}
>>>>>>> afab407a68f26aa25bea7be56a2c2d47b33d6d44
		} else {
			fParsers.modIfcBodyItemParser().parse(gen_blk, "for");
		}
Solution content
		parent.addChildItem(gen_blk);

		if (fLexer.peekKeyword("begin")) {
			gen_begin_end(gen_blk);
		} else {
			fParsers.modIfcBodyItemParser().parse(gen_blk, "for");
		}
File
SVGenerateBlockParser.java
Developer's decision
Version 1
Kind of conflict
Comment
If statement
Method invocation
While statement