Skip to content

Commit

Permalink
Remove unused/old code
Browse files Browse the repository at this point in the history
  • Loading branch information
chbloemer committed Jan 17, 2025
1 parent 949e8b1 commit 882e496
Show file tree
Hide file tree
Showing 21 changed files with 10 additions and 409 deletions.
26 changes: 0 additions & 26 deletions src/main/java/de/neuland/pug4j/compiler/InterpolatedString.java

This file was deleted.

105 changes: 0 additions & 105 deletions src/main/java/de/neuland/pug4j/compiler/Utils.java

This file was deleted.

11 changes: 0 additions & 11 deletions src/main/java/de/neuland/pug4j/lexer/token/Assignment.java

This file was deleted.

This file was deleted.

10 changes: 0 additions & 10 deletions src/main/java/de/neuland/pug4j/lexer/token/Code.java

This file was deleted.

9 changes: 0 additions & 9 deletions src/main/java/de/neuland/pug4j/lexer/token/Deferred.java

This file was deleted.

10 changes: 0 additions & 10 deletions src/main/java/de/neuland/pug4j/lexer/token/PipelessText.java

This file was deleted.

This file was deleted.

19 changes: 0 additions & 19 deletions src/main/java/de/neuland/pug4j/parser/Parser.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import de.neuland.pug4j.exceptions.PugParserException;
import de.neuland.pug4j.expression.ExpressionHandler;
import de.neuland.pug4j.lexer.token.Assignment;
import de.neuland.pug4j.lexer.token.Each;
import de.neuland.pug4j.lexer.Lexer;
import de.neuland.pug4j.lexer.token.*;
Expand Down Expand Up @@ -139,9 +138,6 @@ private Node parseExpr() {
if (token instanceof Each) {
return parseEach();
}
if (token instanceof Code) {
return parseCode();
}
if (token instanceof Expression) {
return parseCode();
}
Expand All @@ -166,10 +162,6 @@ private Node parseExpr() {
if (token instanceof CssClass || token instanceof CssId) {
return parseCssClassOrId();
}
if (token instanceof Assignment) {
return parseAssignment();
}

throw error("INVALID_TOKEN","unexpected token \"" + peek().getType() + "\"",peek());
}

Expand Down Expand Up @@ -703,17 +695,6 @@ private Node parseWhile() {
return node;
}

private Node parseAssignment() {
Token token = expect(Assignment.class);
Token assignmentToken = (Assignment) token;
Node node = new AssigmentNode();
node.setName(assignmentToken.getName());
node.setValue(assignmentToken.getValue());
node.setLineNumber(assignmentToken.getStartLineNumber());
node.setFileName(filename);
return node;
}

private Node parseTag() {
Token token = advance();
String name = token.getValue();
Expand Down
26 changes: 0 additions & 26 deletions src/main/java/de/neuland/pug4j/parser/node/AssigmentNode.java

This file was deleted.

9 changes: 5 additions & 4 deletions src/main/java/de/neuland/pug4j/parser/node/CallNode.java
Original file line number Diff line number Diff line change
Expand Up @@ -135,10 +135,11 @@ private void writeAttributes(PugModel model, MixinNode mixin, PugTemplate templa
throw new PugCompilerException(this, template.getTemplateLoader(), e);
}
if(o instanceof Map) {
((Map<String, String>) o).entrySet().stream()
.map(entry -> new Attr(entry.getKey(), entry.getValue(), false))
.forEachOrdered(newAttributes::add);
}
for (Map.Entry<String, String> entry : ((Map<String, String>) o).entrySet()) {
Attr attr = new Attr(entry.getKey(), entry.getValue(), false);
newAttributes.add(attr);
}
}
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public void execute(IndentWriter writer, PugModel model, PugTemplate template) t

private boolean checkCondition(PugModel model, String condition, ExpressionHandler expressionHandler) throws ExpressionException {
Boolean value = expressionHandler.evaluateBooleanExpression(condition, model);
return (value == null) ? false : value;
return value != null && value;
}

public List<IfConditionNode> getConditions() {
Expand Down
6 changes: 1 addition & 5 deletions src/main/java/de/neuland/pug4j/parser/node/EachNode.java
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ private void runIterator(Iterator<?> iterator, PugModel model, IndentWriter writ

private void runMap(Map<Object, Object> result, PugModel model, IndentWriter writer, PugTemplate template) {
Set<Object> keys = result.keySet();
if (keys.size() == 0) {
if (keys.isEmpty()) {
executeElseNode(model, writer, template);
return;
}
Expand Down Expand Up @@ -97,10 +97,6 @@ public void setKey(String key) {
this.key = key;
}

public Node getElseNode() {
return elseNode;
}

public void setElseNode(Node elseNode) {
this.elseNode = elseNode;
}
Expand Down
23 changes: 0 additions & 23 deletions src/main/java/de/neuland/pug4j/parser/node/ExtendsNode.java

This file was deleted.

40 changes: 0 additions & 40 deletions src/main/java/de/neuland/pug4j/parser/node/FileReference.java

This file was deleted.

5 changes: 1 addition & 4 deletions src/main/java/de/neuland/pug4j/parser/node/FilterNode.java
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public void execute(IndentWriter writer, PugModel model, PugTemplate template) t
}

private Map<String, Object> convertToFilterAttributes(PugTemplate template, PugModel model, LinkedList<Attr> attributes) {
Map evaluatedAttributes = new HashMap<String,Object>() ;
Map<String,Object> evaluatedAttributes = new HashMap<String,Object>() ;
for (Attr attribute : attributes) {
if(attribute.getValue() instanceof ExpressionString) {
try {
Expand All @@ -81,7 +81,4 @@ public void setFilter(LinkedList<IncludeFilterNode> filters) {
this.filters = filters;
}

public boolean hasFilters(){
return this.filters.size()>0;
}
}
Loading

0 comments on commit 882e496

Please sign in to comment.