Netsyms/SyMAT
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge origin/master

Browse Source 
Conflicts:
	src/net/apocalypselabs/symat/functions.java.txt
This commit is contained in:
Skylar Ittner 2015-12-22 02:21:34 -07:00
commit cc970d3a39
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/net/apocalypselabs/symat/CodeCompleter.java
View File

@ -109,6 +109,10 @@ public class CodeCompleter {
switch (fileid) { switch (fileid) {
case "functions": case "functions":
String[] args = line.split("\\|"); String[] args = line.split("\\|");
// Prefix symat to Java commands
if (lang.equals("java")) {
args[0] = "symat." + args[0];
}
if (args.length == 2) { if (args.length == 2) {
provider.addCompletion(new BasicCompletion(provider, args[0], args[1])); provider.addCompletion(new BasicCompletion(provider, args[0], args[1]));
} else if (args.length == 3) { } else if (args.length == 3) {

2
src/net/apocalypselabs/symat/functions.java.txt
View File

@ -3,4 +3,4 @@ JavaFunctions symat = new JavaFunctions();
public static final double E = java.lang.Math.E; public static final double E = java.lang.Math.E;
public static final double PI = java.lang.Math.PI; public static final double PI = java.lang.Math.PI;
public static final double SQRT1_2 = java.lang.Math.sqrt(0.5); public static final double SQRT1_2 = java.lang.Math.sqrt(0.5);
public static final double SQRT2 = java.lang.Math.sqrt(2); public static final double SQRT2 = java.lang.Math.sqrt(2);