Skip to content

Commit c98177f

Browse files
DavePearceDavePearce
committed
More fixes; Almost there.
1 parent a685c2c commit c98177f

File tree

4 files changed

+121
-69
lines changed

4 files changed

+121
-69
lines changed

‎src/main/java/wyjs/Activator.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ public Build.Task initialise(Path path, Command.Environment environment) throws
9999
// // Register corresponding build target
100100
// registerBuildTarget(configuration, project, pkgRoot, depName, includes);
101101
// }
102+
return new JavaScriptCompileTask();
102103
}
103104

104105
private void registerBuildTarget(Configuration configuration, Build.Project project, FileSystem.Root sourceRoot,

‎src/main/java/wyjs/core/JavaScriptFile.java‎

Lines changed: 42 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,19 @@
2323
import java.util.ArrayList;
2424
import java.util.Arrays;
2525
import java.util.Collection;
26+
import java.util.Collections;
2627
import java.util.List;
2728

29+
import wyc.lang.WhileyFile;
2830
import wycc.util.Pair;
29-
import wyfs.lang.Content;
31+
import wyil.lang.WyilFile;
32+
import wycc.lang.Build;
33+
import wycc.lang.Content;
34+
import wycc.lang.Path;
3035
import wycc.util.ArrayUtils;
3136
import wyjs.io.JavaScriptFilePrinter;
3237

33-
public class JavaScriptFile {
38+
public class JavaScriptFile implements Build.Artifact {
3439
// =========================================================================
3540
// Content Type
3641
// =========================================================================
@@ -40,20 +45,9 @@ public class JavaScriptFile {
4045
* extension is ".wyil" for WyilFiles.
4146
*/
4247
public static final Content.Type<JavaScriptFile> ContentType = new Content.Type<JavaScriptFile>() {
43-
public Path.Entry<JavaScriptFile> accept(Path.Entry<?> e) {
44-
if (e.contentType() == this) {
45-
return (Path.Entry<JavaScriptFile>) e;
46-
}
47-
return null;
48-
}
49-
50-
@Override
51-
public JavaScriptFile read(Path.Entry<JavaScriptFile> e, InputStream input) throws IOException {
52-
return read(e.id(), e.inputStream());
53-
}
5448

5549
@Override
56-
public JavaScriptFile read(Path.ID id, InputStream inputStream) throws IOException {
50+
public JavaScriptFile read(Path p, InputStream inputStream, Content.Registry registry) throws IOException {
5751
// NOTE: this is strictly a hack at this time as its unclear what the best
5852
// alternative option is. Specifically, parsing JavaScriptFiles is not something
5953
// I'm contemplating right now :)
@@ -69,7 +63,7 @@ public JavaScriptFile read(Path.ID id, InputStream inputStream) throws IOExcepti
6963
// Finally, construct the native declaration
7064
NativeDeclaration d = new NativeDeclaration(text.toString());
7165
//
72-
JavaScriptFile js = new JavaScriptFile(true, Standard.ES6);
66+
JavaScriptFile js = new JavaScriptFile(p, Collections.EMPTY_LIST, true, Standard.ES6);
7367
// Append our native declarations.
7468
js.declarations.add(d);
7569
return js;
@@ -89,6 +83,11 @@ public String toString() {
8983
public String getSuffix() {
9084
return "js";
9185
}
86+
87+
@Override
88+
public boolean includes(Class<?> kind) {
89+
return kind == JavaScriptFile.class;
90+
}
9291
};
9392

9493
// =========================================================================
@@ -114,11 +113,18 @@ public enum Standard {
114113
//
115114
// =========================================================================
116115

116+
/**
117+
* The filename of this artifact
118+
*/
119+
private final Path path;
120+
/**
121+
* The source files that were combined into this file.
122+
*/
123+
private final List<WyilFile> sources;
117124
/**
118125
* Indicate whether or not to use strict mode.
119126
*/
120127
private final boolean strictMode;
121-
122128
/**
123129
* Indicate which JavaScript standard this file conforms to.
124130
*/
@@ -128,11 +134,13 @@ public enum Standard {
128134
*/
129135
private List<Declaration> declarations;
130136

131-
public JavaScriptFile(Standard standard) {
132-
this(true,standard);
137+
public JavaScriptFile(Path path, List<WyilFile> sources, Standard standard) {
138+
this(path, sources, true, standard);
133139
}
134140

135-
public JavaScriptFile(boolean strictMode, Standard standard) {
141+
public JavaScriptFile(Path path, List<WyilFile> sources, boolean strictMode, Standard standard) {
142+
this.path = path;
143+
this.sources = new ArrayList<>(sources);
136144
this.strictMode = strictMode;
137145
this.standard = standard;
138146
this.declarations = new ArrayList<>();
@@ -175,10 +183,25 @@ public boolean bigInt() {
175183
return standard == Standard.ES6_BIGINT;
176184
}
177185

186+
@Override
187+
public Path getPath() {
188+
return path;
189+
}
190+
178191
public List<Declaration> getDeclarations() {
179192
return declarations;
180193
}
181194

195+
@Override
196+
public Content.Type<JavaScriptFile> getContentType() {
197+
return JavaScriptFile.ContentType;
198+
}
199+
200+
@Override
201+
public List<WyilFile> getSourceArtifacts() {
202+
return sources;
203+
}
204+
182205
// =========================================================================
183206
// Static Constructors
184207
// =========================================================================

‎src/main/java/wyjs/tasks/JavaScriptCompileTask.java‎

Lines changed: 74 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -13,94 +13,122 @@
1313
// limitations under the License.
1414
package wyjs.tasks;
1515

16-
import java.io.IOException;
1716
import java.util.Arrays;
1817
import java.util.Collections;
1918
import java.util.List;
20-
import java.util.function.Function;
21-
2219
import wycc.lang.Build;
20+
import wycc.lang.Build.Artifact;
21+
import wycc.lang.Build.SnapShot;
22+
import wycc.lang.Path;
2323
import wycc.util.Logger;
24+
import wycc.util.Pair;
2425
import wyil.lang.WyilFile;
2526
import wyjs.core.JavaScriptFile;
2627

27-
public class JavaScriptCompileTask extends AbstractBuildTask<WyilFile, JavaScriptFile> {
28-
28+
public class JavaScriptCompileTask implements Build.Task {
2929
/**
3030
* Enable debug mode
3131
*/
3232
protected boolean debug = true;
33-
3433
/**
35-
* For logging information.
34+
* The set of source files that this task will compiler from.
3635
*/
37-
private Logger logger = Logger.NULL;
38-
36+
private final WyilFile source;
37+
/**
38+
* Identifier for target of this build task.
39+
*/
40+
private final Path target;
3941
/**
4042
* Additional JavaScript files to include in generated file.
4143
*/
42-
private List<Path.Entry<JavaScriptFile>> includes = Collections.EMPTY_LIST;
43-
44-
public JavaScriptCompileTask(Build.Project project, Path.Entry<JavaScriptFile> target,
45-
Path.Entry<WyilFile> sources) {
46-
super(project, target, Arrays.asList(sources));
47-
}
44+
private List<JavaScriptFile> includes = Collections.EMPTY_LIST;
4845

49-
public void setLogger(Logger logger) {
50-
this.logger = logger;
46+
public JavaScriptCompileTask(Path target,
47+
WyilFile source) {
48+
this.target = target;
49+
this.source = source;
5150
}
5251

5352
public void setDebug(boolean debug) {
5453
this.debug = debug;
5554
}
5655

57-
public void setIncludes(List<Path.Entry<JavaScriptFile>> includes) {
56+
public void setIncludes(List<JavaScriptFile> includes) {
5857
this.includes = includes;
5958
}
6059

6160
@Override
62-
public Build.Project project() {
63-
return project;
61+
public Path getPath() {
62+
return target;
6463
}
6564

6665
@Override
67-
public Function<Build.Meter,Boolean> initialise() throws IOException {
68-
// Extract target and source files for compilation. This is the component which
69-
// requires I/O.
70-
JavaScriptFile jsf = target.read();
71-
WyilFile wyf = sources.get(0).read();
72-
// Extract other (native) includes
73-
JavaScriptFile[] jsincs = readAll(includes);
74-
// Construct the lambda for subsequent execution. This will eventually make its
75-
// way into some kind of execution pool, possibly for concurrent execution with
76-
// other tasks.
77-
return (Build.Meter meter) -> execute(meter, jsf, wyf, jsincs);
66+
public Type<? extends Artifact> getContentType() {
67+
return JavaScriptFile.ContentType;
7868
}
7969

80-
public boolean execute(Build.Meter meter, JavaScriptFile target, WyilFile source, JavaScriptFile... includes) {
81-
meter = meter.fork("JavaScriptCompiler");
70+
@Override
71+
public List<? extends Artifact> getSourceArtifacts() {
72+
return Arrays.asList(source);
73+
}
74+
75+
@Override
76+
public Pair<SnapShot, Boolean> apply(SnapShot s) {
77+
// Compile into a single binary target
78+
Pair<JavaScriptFile, Boolean> r = compile(source);
79+
// Write target into snapshot
80+
s = s.put(r.first());
81+
// Done
82+
return new Pair<>(s, r.second());
83+
}
84+
85+
private Pair<JavaScriptFile, Boolean> compile(WyilFile source) {
86+
boolean strictMode = true;
87+
JavaScriptFile.Standard std = JavaScriptFile.Standard.ES6;
88+
JavaScriptFile jsFile = new JavaScriptFile(target, Arrays.asList(source), strictMode, std);
8289
// FIXME: this is a fairly temporary solution at the moment which just
8390
// turns the WyIL file directly into a string. A more useful solution
8491
// will be to generate an intermediate file representing JavaScript in
8592
// an AST. This would enable, for example, better support for different
8693
// standards. It would also enable minification, and allow support for
8794
// different module systems (e.g. CommonJS).
88-
new JavaScriptCompiler(meter,target).visitModule(source);
95+
new JavaScriptCompiler(jsFile).visitModule(source);
8996
// Process includes
9097
for (JavaScriptFile i : includes) {
91-
target.getDeclarations().addAll(i.getDeclarations());
98+
jsFile.getDeclarations().addAll(i.getDeclarations());
9299
}
93-
//
94-
meter.done();
95-
// How can this fail?
96-
return true;
100+
// How could this fail?
101+
return new Pair<>(jsFile, true);
97102
}
98103

99-
private JavaScriptFile[] readAll(List<Path.Entry<JavaScriptFile>> includes) throws IOException {
100-
JavaScriptFile[] files = new JavaScriptFile[includes.size()];
101-
for(int i=0;i!=files.length;++i) {
102-
files[i] = includes.get(i).read();
103-
}
104-
return files;
105-
}
104+
// @Override
105+
// public Function<Build.Meter,Boolean> initialise() throws IOException {
106+
// // Extract target and source files for compilation. This is the component which
107+
// // requires I/O.
108+
// JavaScriptFile jsf = target.read();
109+
// WyilFile wyf = sources.get(0).read();
110+
// // Extract other (native) includes
111+
// JavaScriptFile[] jsincs = readAll(includes);
112+
// // Construct the lambda for subsequent execution. This will eventually make its
113+
// // way into some kind of execution pool, possibly for concurrent execution with
114+
// // other tasks.
115+
// return (Build.Meter meter) -> execute(meter, jsf, wyf, jsincs);
116+
// }
117+
//
118+
// public boolean execute(Build.Meter meter, JavaScriptFile target, WyilFile source, JavaScriptFile... includes) {
119+
// meter = meter.fork("JavaScriptCompiler");
120+
121+
// //
122+
// meter.done();
123+
// // How can this fail?
124+
// return true;
125+
// }
126+
//
127+
// private JavaScriptFile[] readAll(List<Path.Entry<JavaScriptFile>> includes) throws IOException {
128+
// JavaScriptFile[] files = new JavaScriptFile[includes.size()];
129+
// for(int i=0;i!=files.length;++i) {
130+
// files[i] = includes.get(i).read();
131+
// }
132+
// return files;
133+
// }
106134
}

‎src/main/java/wyjs/tasks/JavaScriptCompiler.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ public class JavaScriptCompiler extends AbstractTranslator<Term, Term, Term> {
8888
*/
8989
private int temporaryIndex = 0;
9090

91-
public JavaScriptCompiler(Build.Meter meter, JavaScriptFile jsFile) {
92-
super(meter,subtyping);
91+
public JavaScriptCompiler(JavaScriptFile jsFile) {
92+
super(Build.NULL_METER,subtyping);
9393
this.jsFile = jsFile;
9494
}
9595

@@ -425,9 +425,9 @@ public Term constructArrayAccessLVal(Expr.ArrayAccess expr, Term source, Term in
425425
if (isJsString(t)) {
426426
// Return character code instead of string.
427427
WyilFile parent = (WyilFile) expr.getHeap();
428-
throw new SyntacticException("Cannot assign JavaScript strings as they are immutable!", parent.getEntry(), expr);
428+
throw new SyntacticException("Cannot assign JavaScript strings as they are immutable!", parent, expr);
429429
} else {
430-
return new ArrayAccess(source,index);
430+
return new ArrayAccess(source, index);
431431
}
432432
}
433433

0 commit comments

Comments
 (0)