修复一个偶发的ConstantData压缩bug

修复一个MyHashMap的树节点扩容的bug
修复Tokenizer做参数tokenize的问题
重构MethodWriter
CodeVisitor出错时会报告位置了
完成之前CI的重构，实现新架构
    重构映射缓存系统，现在才叫“正常”的代码
    支持jar签名
    支持多工作空间
    支持链式依赖
    支持source depend
    支持binary depend
    支持变量替换
    可选写入编译时间
    修复泛型转换bug
    加入了全新的彩虹特效，更加流畅！
 序列化器现已支持Map使用非字符串key
 修复AsmxLauncher启动带数字签名的自身时的崩溃

Author: roj234

docs/Re_Lavac.md

@@ -127,7 +127,7 @@ var list = [1, 2, 3]; // List<Integer> (不可变)
 ### finally优化 (已实现)
   在多个嵌套的finally块中，防止代码体积暴增
 ### 预编译函数 (已实现)
-  在编译期间执行标为【可预编译 @roj.compiler.plugins.eval.Constant】并已知入参的函数，并生成常量结果
+  在编译期间执行标为【可预编译 @roj.compiler.plugins.eval.Constexpr】并已知入参的函数，并生成常量结果
 ### 数组压缩
   将基本类型数组压缩为字符串(Base128)，减少文件体积
 ### 隐式导入|ImportAny (已实现)

java/roj/RojLib.java

@@ -34,7 +34,7 @@ public static void linkLibrary(int bit) {
 	public static Object getLibrary() {return LibraryLoader.INSTANCE.loadLibraryEx(RojLib.class, LibFile);}
 
 	private static final String LibName = "libcpp";
-	private static File LibFile = new File("D:\\mc\\FMD-1.5.2\\projects\\implib\\libcpp\\bin\\libcpp.dll");
+	private static File LibFile = new File("D:\\mc\\MCMake\\projects\\rojlib-jni\\bin\\libcpp.dll");
 
 	public static final boolean ASM_DEBUG = false;
 	public static final boolean IS_DEV;

java/roj/archive/zip/ZEntry.java

@@ -7,6 +7,7 @@
 import roj.text.TextUtil;
 import roj.util.ByteList;
 import roj.util.DynByteBuf;
+import roj.util.Helpers;
 
 import java.nio.file.attribute.FileTime;
 import java.util.TimeZone;
@@ -19,7 +20,7 @@
  * @author Roj234
  * @since 2023/3/14 0014 0:43
  */
-public class ZEntry implements RSegmentTree.Range, ArchiveEntry {
+public class ZEntry implements RSegmentTree.Range, ArchiveEntry, Cloneable {
 	//00: no compression
 	//08: deflated
 	//14: LZMA
@@ -431,6 +432,15 @@ public static int java2DosTime(long time) {
 		return (year << 25) | (arr[ACalendar.MONTH] << 21) | (arr[ACalendar.DAY] << 16) | (arr[ACalendar.HOUR] << 11) | (arr[ACalendar.MINUTE] << 5) | (arr[ACalendar.SECOND] >> 1);
 	}
 
+	@Override
+	protected ZEntry clone() {
+		try {
+			return (ZEntry) super.clone();
+		} catch (CloneNotSupportedException e) {
+			return Helpers.nonnull();
+		}
+	}
+
 	private static final long WINDOWS_TIME_NOT_AVAILABLE = Long.MIN_VALUE;
 	public static long checkAndSet0(long time) { return time == WINDOWS_TIME_NOT_AVAILABLE ? 0 : time; }
 	private static final long WINDOWS_EPOCH_IN_MICROSECONDS = -11644473600000000L;

java/roj/archive/zip/ZipArchive.java

@@ -32,6 +32,7 @@
 import java.util.zip.ZipException;
 
 import static roj.archive.zip.ZEntry.MZ_NoCrc;
+import static roj.reflect.ReflectionUtils.u;
 
 /**
  * 支持分卷压缩文件
@@ -417,7 +418,10 @@ public void accept(List<? extends Range> files, long length) {
 	 */
 	public void reopen() throws IOException {
 		if (file == null) throw new IOException("不是从文件打开");
-		if (r == null) r = ArchiveUtils.tryOpenSplitArchive(file, false);
+		if (r == null) {
+			r = ArchiveUtils.tryOpenSplitArchive(file, false);
+			fpRead = null;
+		}
 	}
 
 	private static void checkName(EntryMod entry) {

java/roj/archive/zip/ZipFile.java

@@ -40,13 +40,13 @@
  */
 public class ZipFile implements ArchiveFile {
 	Source r;
-	private Source fpRead;
+	Source fpRead;
 	private static final long FPREAD_OFFSET = ReflectionUtils.fieldOffset(ZipFile.class, "fpRead");
 
 	private static final XHashSet.Shape<String, ZEntry> ENTRY_SHAPE = XHashSet.noCreation(ZEntry.class, "name", "next");
 
 	XHashSet<String, ZEntry> namedEntries;
-	SimpleList<ZEntry> entries;
+	SimpleList<ZEntry> entries = new SimpleList<>();
 
 	private ByteList buf;
 	final Charset cs;
@@ -128,7 +128,7 @@ public void close() throws IOException {
 	}
 
 	public final void reload() throws IOException {
-		entries = new SimpleList<>();
+		entries.clear();
 		namedEntries = null;
 		cDirLen = cDirOffset = 0;
 
@@ -338,7 +338,7 @@ private void readLOC(SimpleList<ZEntry> locEntries) throws IOException {
 		// 8; HAS EXT
 		if ((flags & 8) != 0 && cSize == 0) {
 			// skip method
-			InflateIn in1 = (InflateIn) getCachedInflater(r.asInputStream());
+			InflateIn in1 = (InflateIn) getCachedInflater(new SourceInputStream(r, Long.MAX_VALUE, false));
 			byte[] tmp = buf.list;
 			while (in1.read(tmp) >= 0);
 
@@ -487,7 +487,8 @@ private void readEND64() throws IOException {
 		cDirOffset = buf.readLongLE(36);
 	}
 
-	private void verifyEntry(Source r, ZEntry entry) throws IOException {
+	public void validateEntry(ZEntry entry) throws IOException {validateEntry(r, entry);}
+	private void validateEntry(Source r, ZEntry entry) throws IOException {
 		if ((entry.mzFlag & ZEntry.MZ_ERROR) != 0 && (flags & FLAG_VERIFY) != 0) throw new ZipException(entry+"报告自身已损坏");
 		if ((entry.mzFlag & ZEntry.MZ_BACKWARD) == 0) return;
 
@@ -566,7 +567,7 @@ public final InputStream getFileStream(ZEntry entry) throws IOException {
 		Source src = (Source) u.getAndSetObject(this, FPREAD_OFFSET, null);
 		if (src == null) src = r.threadSafeCopy();
 
-		verifyEntry(src, entry);
+		validateEntry(src, entry);
 		src.seek(entry.offset);
 		return new SourceInputStream.Shared(src, entry.cSize, this, FPREAD_OFFSET);
 	}

java/roj/archive/zip/ZipFileWriter.java

@@ -54,13 +54,14 @@ public ZipFileWriter(Source file, int compression) throws IOException {
 	public void setComment(byte[] comment) { this.comment = comment; }
 
 	public void writeNamed(String name, ByteList b) throws IOException { writeNamed(name, b, ZipEntry.DEFLATED); }
-	public void writeNamed(String name, ByteList b, int method) throws IOException {
+	public void writeNamed(String name, ByteList b, int method) throws IOException { writeNamed(name, b, method, System.currentTimeMillis()); }
+	public void writeNamed(String name, ByteList b, int method, long modTime) throws IOException {
 		if (entry != null) closeEntry();
 		if (name.endsWith("/")) throw new ZipException("目录不是空的: "+name);
 
 		int crc = CRC32s.once(b.list, b.arrayOffset()+b.rIndex, b.readableBytes());
 
-		int time = ZEntry.java2DosTime(System.currentTimeMillis());
+		int time = ZEntry.java2DosTime(modTime);
 		ByteList buf = this.buf;
 		buf.clear();
 		buf.putInt(HEADER_LOC)
@@ -133,7 +134,18 @@ public void copy(ArchiveFile o, ArchiveEntry e) throws IOException {
 
 		if (this.entry != null) closeEntry();
 		long entryBeginOffset = file.position();
-		file.put(owner.source(), entry.startPos(), entry.endPos() - entry.startPos());
+
+		// 20250221 fixed 文件中不知道长度的Entry但是经过读取已经知道了，所以复制之前需要重写CEntry
+		owner.validateEntry(entry);
+		if ((entry.flags & GP_HAS_EXT) != 0 && entry.getCompressedSize() != 0) {
+			entry = entry.clone();
+			entry.flags &= ~GP_HAS_EXT;
+			ZipArchive.writeLOC(file, buf, entry);
+			file.put(owner.source(), entry.getOffset(), entry.getCompressedSize());
+		} else {
+			file.put(owner.source(), entry.startPos(), entry.endPos() - entry.startPos());
+		}
+
 		long delta = entryBeginOffset - entry.startPos();
 		entry.offset += delta;
 		buf.clear();

java/roj/archive/zip/ZipOutput.java

@@ -27,20 +27,25 @@ public ZipOutput(File file) {
 	public boolean isCompress() { return compress; }
 	public void setCompress(boolean compress) { this.compress = compress; }
 
-	public void begin(boolean allModifyMode) throws IOException {
+	public boolean isUseZFW() {return useZFW;}
+	public ZipFileWriter getZFW() {return all;}
+
+	public void begin(boolean increment) throws IOException {
 		if (work) end();
 
-		useZFW = allModifyMode;
-		if (allModifyMode) {
+		useZFW = !increment;
+		if (increment) {
+			if (some == null) {
+				some = new ZipArchive(file);
+			} else {
+				some.reopen();
+			}
+		} else {
 			all = new ZipFileWriter(file);
 			if (some != null) {
 				some.close();
 				some = null;
 			}
-		} else if (some == null) {
-			some = new ZipArchive(file);
-		} else {
-			some.reopen();
 		}
 		work = true;
 	}
@@ -63,26 +68,34 @@ public void set(String name, Supplier<ByteList> data) throws IOException {
 		}
 	}
 
-	public void set(String name, InputStream in) throws IOException {
+	public void set(String name, Supplier<ByteList> data, long modTime) throws IOException {
+		if (useZFW) {
+			all.writeNamed(name, data.get(), compress ? ZipEntry.DEFLATED : ZipEntry.STORED, modTime);
+		} else {
+			some.put(name, data, compress).entry.setModificationTime(modTime);
+		}
+	}
+
+	public void setStream(String name, Supplier<InputStream> data, long modTime) throws IOException {
 		if (useZFW) {
 			ZEntry ze = new ZEntry(name);
 			ze.setMethod(compress ? ZipEntry.DEFLATED : ZipEntry.STORED);
+			ze.setModificationTime(modTime);
 			all.beginEntry(ze);
 
 			byte[] b = IOUtil.getSharedByteBuf().list;
 			int r;
-			try {
+			try (var in = data.get()) {
 				do {
 					r = in.read(b);
 					if (r < 0) break;
 					all.write(b, 0, r);
 				} while (r == b.length);
 			} finally {
-				in.close();
 				all.closeEntry();
 			}
 		} else {
-			some.putStream(name, in, compress);
+			some.putStream(name, data, compress);
 		}
 	}
 

java/roj/asm/cp/ConstantPool.java

@@ -284,11 +284,11 @@ public void setUTFValue(CstUTF c, String str) {
 	}
 
 	private void addConstant(Constant c) {
-		int size = constants.size();
-		if (size >= 0xFFFE) throw new UnsupportedOperationException("constant overflow!");
-		c.setIndex(size+1);
 		refMap.add(c);
 		constants.add(c);
+		int size = constants.size();
+		c.setIndex(size);
+		if (size >= 0xFFFF) throw new UnsupportedOperationException("constant overflow!");
 
 		switch (c.type()) {
 			case UTF -> length += 3 + DynByteBuf.byteCountDioUTF(((CstUTF) c).str());

java/roj/asm/tree/anno/AnnVal.java

@@ -14,6 +14,7 @@
  */
 public abstract class AnnVal {
 	public static AnnVal valueOf(String v) { return new AnnValString(v); }
+	public static AnnVal valueOf(boolean v) { return new AnnValInt(BOOLEAN, v ? 1 : 0); }
 	public static AnnVal valueOf(byte v) { return new AnnValInt(BYTE, v); }
 	public static AnnVal valueOf(char v) { return new AnnValInt(CHAR, v); }
 	public static AnnVal valueOf(short v) { return new AnnValInt(SHORT, v); }

java/roj/asm/type/Generic.java

@@ -5,6 +5,7 @@
 import roj.text.logging.Logger;
 import roj.util.Helpers;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.function.UnaryOperator;
 
@@ -37,6 +38,9 @@ public Generic(String owner, int array, byte extendType) {
 		setArrayDim(array);
 	}
 
+	public static Type type(String type) {return new Type(type);}
+	public static Generic generic(String type, IType...rest) {return new Generic(type, Arrays.asList(rest));}
+
 	public boolean canBeAny() { return extendType == EX_EXTENDS && owner.equals("java/lang/Object") && children.isEmpty() && sub == null; }
 
 	public void toDesc(CharList sb) {