Skip to content

Commit

Permalink
#162: conflicts resolved
Browse files Browse the repository at this point in the history
  • Loading branch information
@includealex
includealex committed Sep 23, 2022
1 parent 6ec8735 commit f5f02ea
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
4 changes: 0 additions & 4 deletions src/main/kotlin/org/polystat/j2eo/treeMapper/TreeMappings.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,11 +194,7 @@ fun BlockContext.toBlock(): Block {
val blockStmnts = BlockStatements(blockStmntsLst.removeFirstOrNull())
blockStmntsLst.forEach { blockStmnts.add(it) }
blockStmnts.blockStatements.removeIf { it == null }
<<<<<<< HEAD
return Block(null /*not always null? */, blockStmnts)
=======
return Block(null, blockStmnts)
>>>>>>> master
}

fun Declaration.toBlockStatement(): BlockStatement = BlockStatement(this)
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/org/polystat/j2eo/util/StaticGenerator.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ fun generateStatic(clsDec: NormalClassDeclaration, context: Context): List<EOBnd
dec.modifiers?.modifiers?.modifiers?.find { it == TokenCode.Static } != null ||
dec is ConstructorDeclaration ||
dec is ClassDeclaration /* FIXME (IT'S NOT ALWAYS TRUE) */
dec is ClassDeclaration
dec is ClassDeclaration
}
.map { mapClassDeclaration(it, context) }
.flatten()
Expand Down

8 comments on commit f5f02ea

@0pdd
Copy link
Member

@0pdd 0pdd commented on f5f02ea Sep 23, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Puzzle 165-1cf62450 discovered in src/main/kotlin/org/polystat/j2eo/translator/Expressions.kt) and submitted as #177. Please, remember that the puzzle was not necessarily added in this particular commit. Maybe it was added earlier, but we discovered it only now.

@0pdd
Copy link
Member

@0pdd 0pdd commented on f5f02ea Sep 23, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Puzzle 165-24ecaa6d discovered in src/main/kotlin/org/polystat/j2eo/translator/Expressions.kt) and submitted as #178. Please, remember that the puzzle was not necessarily added in this particular commit. Maybe it was added earlier, but we discovered it only now.

@0pdd
Copy link
Member

@0pdd 0pdd commented on f5f02ea Sep 23, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Puzzle 165-25a42f66 discovered in src/main/kotlin/org/polystat/j2eo/translator/MethodInvocations.kt) and submitted as #179. Please, remember that the puzzle was not necessarily added in this particular commit. Maybe it was added earlier, but we discovered it only now.

@0pdd
Copy link
Member

@0pdd 0pdd commented on f5f02ea Sep 23, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Puzzle 165-887e92f6 discovered in src/test/resources/test_ready/ch_8_classes/sec_8_4_method_declarations/sec_8_4_3_method_modifiers/sec_8_4_3_4_native_methods/SampleTest.java) and submitted as #180. Please, remember that the puzzle was not necessarily added in this particular commit. Maybe it was added earlier, but we discovered it only now.

@0pdd
Copy link
Member

@0pdd 0pdd commented on f5f02ea Sep 23, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Puzzle 162-7440c42a discovered in pom.xml) and submitted as #181. Please, remember that the puzzle was not necessarily added in this particular commit. Maybe it was added earlier, but we discovered it only now.

@0pdd
Copy link
Member

@0pdd 0pdd commented on f5f02ea Sep 23, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Puzzle 162-89bfa4fd discovered in pom.xml) and submitted as #182. Please, remember that the puzzle was not necessarily added in this particular commit. Maybe it was added earlier, but we discovered it only now.

@0pdd
Copy link
Member

@0pdd 0pdd commented on f5f02ea Sep 23, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Puzzle 162-a61abee6 discovered in pom.xml) and submitted as #183. Please, remember that the puzzle was not necessarily added in this particular commit. Maybe it was added earlier, but we discovered it only now.

@0pdd
Copy link
Member

@0pdd 0pdd commented on f5f02ea Sep 23, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Puzzle 162-251e7a1d discovered in pom.xml) and submitted as #184. Please, remember that the puzzle was not necessarily added in this particular commit. Maybe it was added earlier, but we discovered it only now.

Please sign in to comment.