wave N+3: vfbuild18 fixes (aas EF lambda copy in attach)
This commit is contained in:
parent
9411ff3dbe
commit
d45625b3e0
3 changed files with 68 additions and 3 deletions
30
build-logs/vfbuild18.log
Normal file
30
build-logs/vfbuild18.log
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
/storage/aboba/evovis-client/src/main/java/defpackage/aas.java:1967: error: local variables referenced from a lambda expression must be final or effectively final
|
||||
var1.add(chip(var3x));
|
||||
^
|
||||
/storage/aboba/evovis-client/src/main/java/defpackage/aas.java:1986: error: local variables referenced from a lambda expression must be final or effectively final
|
||||
var5 = var1.iterator();
|
||||
^
|
||||
/storage/aboba/evovis-client/src/main/java/defpackage/aas.java:2009: error: local variables referenced from a lambda expression must be final or effectively final
|
||||
if (var1.size() >= (-2136531848 | 2136531856) + (-2136531848 & 2136531856)) {
|
||||
^
|
||||
Note: Some input files use or override a deprecated API.
|
||||
Note: Recompile with -Xlint:deprecation for details.
|
||||
Note: Some input files use unchecked or unsafe operations.
|
||||
Note: Recompile with -Xlint:unchecked for details.
|
||||
3 errors
|
||||
|
||||
FAILURE: Build failed with an exception.
|
||||
|
||||
* What went wrong:
|
||||
Execution failed for task ':compileJava' (registered by plugin class 'org.gradle.api.plugins.JavaBasePlugin').
|
||||
> Compilation failed; see the compiler output below.
|
||||
/storage/aboba/evovis-client/src/main/java/defpackage/aas.java:1967: error: local variables referenced from a lambda expression must be final or effectively final
|
||||
var1.add(chip(var3x));
|
||||
^
|
||||
3 errors
|
||||
|
||||
* Try:
|
||||
> Check your code and dependencies to fix the compilation error(s)
|
||||
> Run with --scan to get full insights from a Build Scan (powered by Develocity).
|
||||
|
||||
BUILD FAILED in 7s
|
||||
|
|
@ -1942,6 +1942,7 @@ public class aas {
|
|||
break;
|
||||
case -546943479:
|
||||
var1 = var3;
|
||||
final List var1f = var1;
|
||||
akt.pickAttachments(var1x -> {
|
||||
Iterator var2x = null;
|
||||
akk var3x = null;
|
||||
|
|
@ -1964,7 +1965,7 @@ public class aas {
|
|||
case -1120358455:
|
||||
return;
|
||||
case -665616634:
|
||||
var1.add(chip(var3x));
|
||||
var1f.add(chip(var3x));
|
||||
var7 = -1779189588;
|
||||
break;
|
||||
case -492280397:
|
||||
|
|
@ -1983,7 +1984,7 @@ public class aas {
|
|||
break;
|
||||
case 4014117:
|
||||
var4x = 0;
|
||||
var5 = var1.iterator();
|
||||
var5 = var1f.iterator();
|
||||
var7 = -492280397;
|
||||
break;
|
||||
case 170325971:
|
||||
|
|
@ -2006,7 +2007,7 @@ public class aas {
|
|||
break;
|
||||
case 1775598624:
|
||||
var3x = (akk)var2x.next();
|
||||
if (var1.size() >= (-2136531848 | 2136531856) + (-2136531848 & 2136531856)) {
|
||||
if (var1f.size() >= (-2136531848 | 2136531856) + (-2136531848 & 2136531856)) {
|
||||
var7 = -2074190210;
|
||||
} else {
|
||||
var7 = 4014117;
|
||||
|
|
|
|||
34
tools/waves_n3.py
Normal file
34
tools/waves_n3.py
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
"""Волна N+3: vfbuild18 — 3 EF в aas.java (lambda capture var1). Запуск: python3 tools/waves_n3.py"""
|
||||
|
||||
import os, sys
|
||||
|
||||
ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
||||
JAVA = os.path.join(ROOT, "src/main/java")
|
||||
REL = "defpackage/aas.java"
|
||||
p = os.path.join(JAVA, REL)
|
||||
L = open(p, encoding="utf-8", errors="replace").read().splitlines()
|
||||
ok = True
|
||||
|
||||
|
||||
def edit(ln, old, new):
|
||||
global ok
|
||||
i = ln - 1
|
||||
if i < len(L) and old in L[i]:
|
||||
L[i] = L[i].replace(old, new, 1)
|
||||
elif i < len(L) and new in L[i]:
|
||||
pass
|
||||
else:
|
||||
ok = False
|
||||
print(f"MISS {ln}: {old!r} got {L[i].strip() if i < len(L) else '<oob>'!r}")
|
||||
|
||||
|
||||
edit(2009, "if (var1.size() >= ", "if (var1f.size() >= ")
|
||||
edit(1986, "var5 = var1.iterator();", "var5 = var1f.iterator();")
|
||||
edit(1967, "var1.add(chip(var3x));", "var1f.add(chip(var3x));")
|
||||
# insert before 1945
|
||||
if not any("final List var1f = var1;" in x for x in L[1940:1946]):
|
||||
L.insert(1944, " final List var1f = var1;")
|
||||
|
||||
open(p, "w", encoding="utf-8").write("\n".join(L) + "\n")
|
||||
print("OK" if ok else "PROBLEMS")
|
||||
sys.exit(0 if ok else 1)
|
||||
Loading…
Add table
Add a link
Reference in a new issue