Use FluentDSL in analysis module (#1311)

cpg-core/src/main/kotlin/de/fraunhofer/aisec/cpg/graph/builder/Fluent.kt

@@ -684,7 +684,11 @@ fun LanguageFrontend<*, *>.whileCondition(init: WhileStatement.() -> Expression)
 }
 
 /**
+<<<<<<< HEAD
  * Configures the [DoStatement.condition] in the Fluent Node DSL of the nearest
+=======
+ * <<<<<<< HEAD Configures the [DoStatement.condition] in the Fluent Node DSL of the nearest
+>>>>>>> 96ea3b6b4 (Use FluentDSL in analysis module (#1311))
  * enclosing [DoStatement]. The [init] block can be used to create further sub-nodes as well as
  * configuring the created node itself.
  */
@@ -695,9 +699,16 @@ fun LanguageFrontend<*, *>.whileCondition(init: DoStatement.() -> Expression): E
 }
 
 /**
+<<<<<<< HEAD
+=======
+ * Creates a new [CompoundStatement] in the Fluent Node DSL and sets it to the
+ * [IfStatement.thenStatement] of the nearest enclosing [IfStatement]. The [init] block can be used
+ * to create further sub-nodes as well as configuring the created node itself.
+ * =======
+>>>>>>> 96ea3b6b4 (Use FluentDSL in analysis module (#1311))
  * Creates a new [Block] in the Fluent Node DSL and sets it to the [IfStatement.thenStatement] of
  * the nearest enclosing [IfStatement]. The [init] block can be used to create further sub-nodes as
- * well as configuring the created node itself.
+ * well as configuring the created node itself. >>>>>>> main
  */
 context(IfStatement)
 
@@ -744,24 +755,6 @@ fun LanguageFrontend<*, *>.loopBody(init: Block.() -> Unit): Block {
 }
 
 /**
-<<<<<<< HEAD
- * Creates a new [CompoundStatement] in the Fluent Node DSL and sets it to the
- * [DoStatement.statement] of the nearest enclosing [DoStatement]. The [init] block can be used to
- * create further sub-nodes as well as configuring the created node itself.
- */
-context(DoStatement)
-
-fun LanguageFrontend<*, *>.loopBody(init: Block.() -> Unit): Block {
-    val node = newBlock()
-    init(node)
-    statement = node
-
-    return node
-}
-
-/**
-=======
->>>>>>> 29ccee203 (Renaming nodes to be shorter and more consistent (#1303))
  * Creates a new [Block] in the Fluent Node DSL and sets it to the [WhileStatement.statement] of the
  * nearest enclosing [WhileStatement]. The [init] block can be used to create further sub-nodes as
  * well as configuring the created node itself.
@@ -777,6 +770,7 @@ fun LanguageFrontend<*, *>.loopBody(init: Block.() -> Unit): Block {
 }
 
 /**
+<<<<<<< HEAD
 <<<<<<< HEAD
  * Creates a new [Block] in the Fluent Node DSL and sets it to the [SwitchStatement.statement] of
  * the nearest enclosing [SwitchStatement]. The [init] block can be used to create further sub-nodes
@@ -786,6 +780,11 @@ fun LanguageFrontend<*, *>.loopBody(init: Block.() -> Unit): Block {
  * [SwitchStatement.statement] of the nearest enclosing [SwitchStatement]. The [init] block can be
  * used to create further sub-nodes as well as configuring the created node itself.
 >>>>>>> 29ccee203 (Renaming nodes to be shorter and more consistent (#1303))
+=======
+ * Creates a new [Block] in the Fluent Node DSL and sets it to the [SwitchStatement.statement] of
+ * the nearest enclosing [SwitchStatement]. The [init] block can be used to create further sub-nodes
+ * as well as configuring the created node itself.
+>>>>>>> 96ea3b6b4 (Use FluentDSL in analysis module (#1311))
  */
 context(SwitchStatement)