Projects >> kuromoji >>753a54bdace13b9edd7d67057923e324c4c7eb38

Chunk
Conflicting content 
    public void compileState(State state) throws IOException {
        if (state.getTargetJumpAddress() == -1) {
<<<<<<< HEAD
            int jumpBytes = findMaxJumpAddressBytes(state);
            int outputBytes = findMaxOutputBytes(state);

            writeStateArcs(state, outputBytes, jumpBytes);
            writeStateType(state, outputBytes, jumpBytes);
=======
            writeStateArcs(state);
            writeStateType(state);
>>>>>>> 098d1b661505c30d397595c7a99040dc08ae08fd
            // The last arc is regarded as a state because we evaluate the FST backwards.
            state.setTargetJumpAddress(written - 1);
        }
Solution content 
    public void compileState(State state) throws IOException {
        if (state.getTargetJumpAddress() == -1) {
            int jumpBytes = findMaxJumpAddressBytes(state);
            int outputBytes = findMaxOutputBytes(state);

            writeStateArcs(state, outputBytes, jumpBytes);
            writeStateType(state, outputBytes, jumpBytes);

            // The last arc is regarded as a state because we evaluate the FST backwards.
            state.setTargetJumpAddress(written - 1);
        }
File
Compiler.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
        Compiler compiledFST = builder.getCompiler();

        assertEquals("" +
<<<<<<< HEAD
            "  50: MATCH\n" +
            "  47:\tr -> 30\t(JMP: 39)\n" +
            "  43:\tc -> 10\t(JMP: 21)\n" +
            "  39: MATCH\n" +
            "  36:\ta -> 0\t(JMP: 33)\n" +
            "  33: MATCH\n" +
            "  30:\tt -> 0\t(JMP: 27)\n" +
            "  27: MATCH\n" +
            "  24:\ts -> 0\t(JMP: 2)\n" +
            "  21: MATCH\n" +
            "  18:\ta -> 0\t(JMP: 15)\n" +
            "  15: MATCH\n" +
            "  12:\tt -> 0\t(JMP: 9)\n" +
            "   9: ACCEPT\n" +
            "   6:\ts -> 10\t(JMP: 2)\n" +
            "   2: ACCEPT\n",
            formatter.format(compiledFST.getBytes())
=======
                " 103: MATCH\n" +
                " 100:\tr -> 30\t(JMP: 80)\n" +
                "  90:\tc -> 10\t(JMP: 41)\n" +
                "  80: MATCH\n" +
                "  77:\ta -> 0\t(JMP: 67)\n" +
                "  67: MATCH\n" +
                "  64:\tt -> 0\t(JMP: 54)\n" +
                "  54: MATCH\n" +
                "  51:\ts -> 0\t(JMP: 2)\n" +
                "  41: MATCH\n" +
                "  38:\ta -> 0\t(JMP: 28)\n" +
                "  28: MATCH\n" +
                "  25:\tt -> 0\t(JMP: 15)\n" +
                "  15: ACCEPT\n" +
                "  12:\ts -> 10\t(JMP: 2)\n" +
                "   2: ACCEPT\n",
            formatter.format(compiledFST.getByteArray())
>>>>>>> 098d1b661505c30d397595c7a99040dc08ae08fd
        );
    }
}
Solution content 
        Compiler compiledFST = builder.getCompiler();

        assertEquals("" +
            "  50: MATCH\n" +
            "  47:\tr -> 30\t(JMP: 39)\n" +
            "  43:\tc -> 10\t(JMP: 21)\n" +
            "  39: MATCH\n" +
            "  36:\ta -> 0\t(JMP: 33)\n" +
            "  33: MATCH\n" +
            "  30:\tt -> 0\t(JMP: 27)\n" +
            "  27: MATCH\n" +
            "  24:\ts -> 0\t(JMP: 2)\n" +
            "  21: MATCH\n" +
            "  18:\ta -> 0\t(JMP: 15)\n" +
            "  15: MATCH\n" +
            "  12:\tt -> 0\t(JMP: 9)\n" +
            "   9: ACCEPT\n" +
            "   6:\ts -> 10\t(JMP: 2)\n" +
            "   2: ACCEPT\n",
            formatter.format(compiledFST.getBytes())
        );
    }
}
File
BitsFormatterTest.java
Developer's decision
Version 1
Kind of conflict
Method invocation