Remove unused/old code

src/main/java/de/neuland/pug4j/util/CharacterParser.java → src/main/java/de/neuland/pug4j/lexer/CharacterParser.java

@@ -1,4 +1,6 @@
-package de.neuland.pug4j.util;
+package de.neuland.pug4j.lexer;
+
+import de.neuland.pug4j.parser.CharacterParserOptions;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -35,19 +37,19 @@ public SyntaxError(String message) {
         }
     }
     public State parse(String src) {
-        Options options = new Options();
+        CharacterParserOptions options = new CharacterParserOptions();
         options.setEnd(src.length());
         return this.parse(src,this.defaultState(),options);
     }
     public State parse(String src,State state) {
-        Options options = new Options();
+        CharacterParserOptions options = new CharacterParserOptions();
         options.setEnd(src.length());
         return this.parse(src,state,options);
     }
 
-    public State parse(String src,State state,Options options){
+    public State parse(String src, State state, CharacterParserOptions options){
       if(options == null) {
-          options = new Options();
+          options = new CharacterParserOptions();
           options.setEnd(src.length());
       }
       if(state == null)
@@ -87,12 +89,12 @@ public State parse(String src,State state,Options options){
 //      };
 //    }
     public Match parseMax(String src) throws SyntaxError {
-        Options options = new Options();
+        CharacterParserOptions options = new CharacterParserOptions();
         return this.parseMax(src, options);
     }
-    public Match parseMax(String src,Options options) throws SyntaxError {
+    public Match parseMax(String src, CharacterParserOptions options) throws SyntaxError {
         if(options == null)
-            options = new Options();
+            options = new CharacterParserOptions();
       int start = options.getStart();
       int index = start;
       State state = this.defaultState();
@@ -143,11 +145,11 @@ private int getStateProp(State state, char bracket){
         return -1;
     }
     public Match parseMaxBracket(String src,char bracket) throws SyntaxError {
-        return this.parseMaxBracket(src,bracket,new Options());
+        return this.parseMaxBracket(src,bracket,new CharacterParserOptions());
     }
-    public Match parseMaxBracket(String src,char bracket,Options options) throws SyntaxError {
+    public Match parseMaxBracket(String src, char bracket, CharacterParserOptions options) throws SyntaxError {
         if (options == null)
-            options = new Options();
+            options = new CharacterParserOptions();
         int start = options.getStart();
         int index = start;
         State state = this.defaultState();
@@ -182,11 +184,11 @@ public Match parseMaxBracket(String src,char bracket,Options options) throws Syn
 //      };
 //    }
     public Match parseUntil(String src,String delimiter) {
-        return this.parseUntil(src,delimiter,new Options());
+        return this.parseUntil(src,delimiter,new CharacterParserOptions());
     }
-    public Match parseUntil(String src,String delimiter,Options options){
+    public Match parseUntil(String src, String delimiter, CharacterParserOptions options){
         if (options == null)
-            options = new Options();
+            options = new CharacterParserOptions();
 
         boolean includeLineComment = options.isIncludeLineComment();
         int start = options.getStart();
@@ -408,7 +410,7 @@ public boolean isString(){
         public boolean isComment(){
             return this.lineComment || this.blockComment;
         }
-        public boolean isNesting(Options options){
+        public boolean isNesting(CharacterParserOptions options){
             return this.isString() || this.isComment() || this.regexp || this.roundDepth > 0 || this.curlyDepth > 0 || this.squareDepth > 0;
         }
         public boolean isNesting(){

src/main/java/de/neuland/pug4j/util/CharacterParserException.java → src/main/java/de/neuland/pug4j/lexer/CharacterParserException.java

@@ -1,4 +1,4 @@
-package de.neuland.pug4j.util;
+package de.neuland.pug4j.lexer;
 
 
 public class CharacterParserException  extends RuntimeException {

src/main/java/de/neuland/pug4j/lexer/Lexer.java

@@ -6,9 +6,7 @@
 import de.neuland.pug4j.lexer.token.*;
 import de.neuland.pug4j.parser.node.ExpressionString;
 import de.neuland.pug4j.template.TemplateLoader;
-import de.neuland.pug4j.util.CharacterParser;
-import de.neuland.pug4j.util.CharacterParserException;
-import de.neuland.pug4j.util.Options;
+import de.neuland.pug4j.parser.CharacterParserOptions;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.text.StringEscapeUtils;
 
@@ -258,7 +256,7 @@ private CharacterParser.Match bracketExpression(int skip){
         closingBrackets.put('{','}');
         closingBrackets.put('[',']');
         char end = closingBrackets.get(start);
-        Options options = new Options();
+        CharacterParserOptions options = new CharacterParserOptions();
         options.setStart(skip+1);
         CharacterParser.Match range;
         try {

src/main/java/de/neuland/pug4j/util/ArgumentSplitter.java → src/main/java/de/neuland/pug4j/parser/ArgumentSplitter.java

@@ -1,5 +1,5 @@
 
-package de.neuland.pug4j.util;
+package de.neuland.pug4j.parser;
 
     import java.util.ArrayList;
     import java.util.Collections;

src/main/java/de/neuland/pug4j/util/Options.java → src/main/java/de/neuland/pug4j/parser/CharacterParserOptions.java

@@ -1,9 +1,9 @@
-package de.neuland.pug4j.util;
+package de.neuland.pug4j.parser;
 
 /**
  * Created by christoph on 14.10.15.
  */
-public class Options {
+public class CharacterParserOptions {
     private int start = 0;
     private int end = 0;
     boolean includeLineComment = false;

src/main/java/de/neuland/pug4j/parser/node/CallNode.java

@@ -7,7 +7,7 @@
 import de.neuland.pug4j.exceptions.PugCompilerException;
 import de.neuland.pug4j.model.PugModel;
 import de.neuland.pug4j.template.PugTemplate;
-import de.neuland.pug4j.util.ArgumentSplitter;
+import de.neuland.pug4j.parser.ArgumentSplitter;
 
 public class CallNode extends AttrsNode {
 

src/test/java/de/neuland/pug4j/expression/BooleanUtilTest.java

@@ -2,10 +2,7 @@
 
 import org.junit.Test;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -16,6 +13,34 @@
  * @since 19/04/2022 20:44
  */
 public class BooleanUtilTest {
+    @Test
+    public void convert() {
+        List<Object> falses = new ArrayList<Object>();
+        List<Object> trues = new ArrayList<Object>();
+
+        falses.add(Integer.valueOf(0));
+        falses.add(Double.valueOf(0.0));
+        falses.add("");
+        falses.add(Boolean.FALSE);
+        falses.add(new ArrayList<String>());
+        falses.add(new int[] {});
+
+        trues.add(Integer.valueOf(1));
+        trues.add(Double.valueOf(0.5));
+        trues.add("a");
+        trues.add(" ");
+        trues.add(Boolean.TRUE);
+        trues.add(Collections.singletonList("a"));
+        trues.add(new int[] { 1, 2 });
+        trues.add(new Object());
+
+        for (Object object : falses) {
+            assertFalse(object + " (" + object.getClass().getName() + ") should be false", BooleanUtil.convert(object));
+        }
+        for (Object object : trues) {
+            assertTrue(object + " (" + object.getClass().getName() + ") should be true", BooleanUtil.convert(object));
+        }
+    }
 
     @Test
     public void testNull() {

src/test/java/de/neuland/pug4j/AttributeLexerTest.java → src/test/java/de/neuland/pug4j/lexer/AttributeLexerTest.java

@@ -1,6 +1,6 @@
-package de.neuland.pug4j;
+package de.neuland.pug4j.lexer;
 
-import de.neuland.pug4j.lexer.Lexer;
+import de.neuland.pug4j.PugConfiguration;
 import de.neuland.pug4j.lexer.token.Attribute;
 import de.neuland.pug4j.lexer.token.Token;
 import de.neuland.pug4j.parser.node.ExpressionString;

src/test/java/de/neuland/pug4j/util/CharacterParserTest.java → src/test/java/de/neuland/pug4j/lexer/CharacterParserTest.java

@@ -1,5 +1,6 @@
-package de.neuland.pug4j.util;
+package de.neuland.pug4j.lexer;
 
+import de.neuland.pug4j.parser.CharacterParserOptions;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -37,7 +38,7 @@ public void testFindsContentsOfBracketedExpressions() throws Exception {
         assertEquals(16,section.getEnd());//exclusive end of string
         assertEquals("foo=\"(\", bar=\"}\"",section.getSrc());
 
-        Options options = new Options();
+        CharacterParserOptions options = new CharacterParserOptions();
         options.setStart(1);
         section = characterParser.parseMax("{foo=\"(\", bar=\"}\"} bing bong", options);
         assertEquals(1,section.getStart());
@@ -65,7 +66,7 @@ public void testFindsCodeUpToACustomDelimiter() throws Exception {
         assertEquals(17,section.getEnd());//exclusive end of string
         assertEquals("foo.bar(\"%>\").baz",section.getSrc());
 
-        Options options = new Options();
+        CharacterParserOptions options = new CharacterParserOptions();
         options.setStart(2);
         section = characterParser.parseUntil("<%foo.bar(\"%>\").baz%> bing bong", "%",options);
         assertEquals(2,section.getStart());

src/test/java/de/neuland/pug4j/util/ArgumentSplitterTest.java → src/test/java/de/neuland/pug4j/parser/ArgumentSplitterTest.java

@@ -1,10 +1,10 @@
-package de.neuland.pug4j.util;
+package de.neuland.pug4j.parser;
 
 import org.junit.Test;
 
 import java.util.List;
 
-import static de.neuland.pug4j.util.ArgumentSplitter.split;
+import static de.neuland.pug4j.parser.ArgumentSplitter.split;
 import static org.junit.Assert.assertEquals;
 
 /**