Skip to content

prevent creating variables with keywords as names #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

prevent creating variables with keywords as names #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/main/java/org/meteordev/starscript/Starscript.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,15 @@
import org.meteordev.starscript.value.Value;
import org.meteordev.starscript.value.ValueMap;

import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
import java.util.function.Supplier;

/** A VM (virtual machine) that can run compiled starscript code, {@link Script}. */
public class Starscript {
public static final Set<String> KEYWORDS = Collections.unmodifiableSet(new HashSet<>(Arrays.asList("null", "true", "false", "and", "or")));
private final ValueMap globals;

private final Stack<Value> stack = new Stack<>();
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/org/meteordev/starscript/value/ValueMap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package org.meteordev.starscript.value;

import org.meteordev.starscript.Starscript;
import org.meteordev.starscript.utils.SFunction;
import org.meteordev.starscript.utils.StarscriptError;

import java.util.HashMap;
import java.util.Map;
Expand Down Expand Up @@ -124,6 +126,9 @@ public Supplier<Value> getRaw(String name) {

/** Sets the variable supplier for the provided name. */
public Supplier<Value> setRaw(String name, Supplier<Value> supplier) {
if (Starscript.KEYWORDS.contains(name)) {
throw new StarscriptError("Variable name cannot be a keyword.");
}
return values.put(name, supplier);
}

Expand Down
6 changes: 6 additions & 0 deletions src/test/java/org/meteordev/starscript/Main.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import org.meteordev.starscript.compiler.Compiler;
import org.meteordev.starscript.compiler.Parser;
import org.meteordev.starscript.utils.Error;
import org.meteordev.starscript.utils.StarscriptError;
import org.meteordev.starscript.value.Value;
import org.meteordev.starscript.value.ValueMap;

Expand Down Expand Up @@ -43,5 +44,10 @@ public static void main(String[] args) {
ss.remove("player.name");

System.out.println("Output #2: " + ss.run(script));

try {
ss.set("true", Value.null_());
throw new AssertionError("Set variable name as keyword.");
} catch (StarscriptError ignored) {}
}
}