ソースを参照

压缩时机改在 Text.java 之内

James 5 年 前
コミット
ea172759eb
1 ファイル変更1 行追加11 行削除
  1. 1 11
      src/main/java/com/jfinal/template/stat/Lexer.java

+ 1 - 11
src/main/java/com/jfinal/template/stat/Lexer.java

@@ -38,13 +38,11 @@ class Lexer {
 	
 	
 	String fileName;
 	String fileName;
 	Set<String> keepLineBlankDirectives;
 	Set<String> keepLineBlankDirectives;
-	Compressor compressor;
 	
 	
 	List<Token> tokens = new ArrayList<Token>();
 	List<Token> tokens = new ArrayList<Token>();
 	
 	
-	public Lexer(StringBuilder content, String fileName, Set<String> keepLineBlankDirectives, Compressor compressor) {
+	public Lexer(StringBuilder content, String fileName, Set<String> keepLineBlankDirectives) {
 		this.keepLineBlankDirectives = keepLineBlankDirectives;
 		this.keepLineBlankDirectives = keepLineBlankDirectives;
-		this.compressor = compressor;
 		
 		
 		int len = content.length();
 		int len = content.length();
 		buf = new char[len + 1];
 		buf = new char[len + 1];
@@ -53,10 +51,6 @@ class Lexer {
 		this.fileName = fileName;
 		this.fileName = fileName;
 	}
 	}
 	
 	
-	public Lexer(StringBuilder content, String fileName, Set<String> keepLineBlankDirectives) {
-		this(content, fileName, keepLineBlankDirectives, null);
-	}
-	
 	/**
 	/**
 	 * 进入每个扫描方法之前 peek() 处于可用状态,不需要 next()
 	 * 进入每个扫描方法之前 peek() 处于可用状态,不需要 next()
 	 * 每个扫描方法内部是否要 next() 移动,取决定具体情况
 	 * 每个扫描方法内部是否要 next() 移动,取决定具体情况
@@ -479,10 +473,6 @@ class Lexer {
 			return ;
 			return ;
 		}
 		}
 		
 		
-		if (compressor != null) {
-			text = compressor.compress(text);
-		}
-		
 		if (previousTextToken != null) {
 		if (previousTextToken != null) {
 			previousTextToken.append(text);
 			previousTextToken.append(text);
 		} else {
 		} else {