Skip to content

Commit ec01caa

Browse files
JDDev0JDDev0
committed
Use new "createDataObject()" method in the "ExampleModule" class
1 parent 20c6f57 commit ec01caa

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

‎src/main/java/me/jddev0/ExampleModule.java

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,28 +33,28 @@ public DataObject load(List<DataObject> args, final int SCOPE_ID) {
3333

3434
//Calling a predefined function (Alternate way)
3535
callPredefinedFunction("println", Arrays.asList(
36-
new DataObject("Another print statement.")
36+
createDataObject("Another print statement.") //createDataObject can be used instead of new DataObject().set...()
3737
), SCOPE_ID);
3838

3939
exportFunction("exampleFunction", (argumentList, INNER_SCOPE_ID) -> {
4040
List<DataObject> innerCombinedArgs = LangUtils.combineArgumentsWithoutArgumentSeparators(argumentList);
4141

4242
System.out.println("exampleFunction was called with " + innerCombinedArgs);
4343

44-
return new DataObject().setInt(innerCombinedArgs.size());
44+
return createDataObject(innerCombinedArgs.size());
4545
});
4646

47-
exportNormalVariable("testVar", new DataObject("This is a test variable provided by the \"" + lmc.getName() + "\" module!"));
48-
exportNormalVariable("intVar", new DataObject().setInt(-42));
49-
exportNormalVariableFinal("finalVar", new DataObject().setInt(-42));
50-
exportCollectionVariable("values", new DataObject().setArray(new DataObject[] {
51-
new DataObject("firstVar"), new DataObject().setBoolean(true), new DataObject().setError(new DataObject.ErrorObject(LangInterpreter.InterpretingError.DIV_BY_ZERO))
47+
exportNormalVariable("testVar", createDataObject("This is a test variable provided by the \"" + lmc.getName() + "\" module!"));
48+
exportNormalVariable("intVar", createDataObject(-42));
49+
exportNormalVariableFinal("finalVar", createDataObject(-42));
50+
exportCollectionVariable("values", createDataObject(new DataObject[] {
51+
createDataObject("firstVar"), createDataObject(true), createDataObject(new DataObject.ErrorObject(LangInterpreter.InterpretingError.DIV_BY_ZERO))
5252
}));
5353
exportCollectionVariable("listOfValues", new DataObject().setList(new LinkedList<>(Arrays.asList(
54-
new DataObject("Test variable"), new DataObject().setNull()
54+
createDataObject("Test variable"), new DataObject().setNull()
5555
))));
5656
exportCollectionVariableFinal("finalValues", new DataObject().setArray(new DataObject[] {
57-
new DataObject().setChar('a'), new DataObject().setBoolean(false)
57+
createDataObject('a'), createDataObject(false)
5858
}));
5959
exportFunctionPointerVariable("calc", new DataObject().setFunctionPointer(new FunctionPointerObject((interpreter, argumentList, INNER_SCOPE_ID) -> {
6060
List<DataObject> combinedArgumentList = LangUtils.combineArgumentsWithoutArgumentSeparators(argumentList);
@@ -75,16 +75,16 @@ public DataObject load(List<DataObject> args, final int SCOPE_ID) {
7575
if(cNum == null)
7676
return new LangInterpreterInterface(interpreter).setErrnoErrorObject(LangInterpreter.InterpretingError.INVALID_ARGUMENTS, "Argument 2 must be a number", INNER_SCOPE_ID);
7777

78-
return new DataObject().setInt(aNum.intValue() * bNum.intValue() + cNum.intValue() * cNum.intValue());
78+
return createDataObject(aNum.intValue() * bNum.intValue() + cNum.intValue() * cNum.intValue());
7979
})));
8080
exportFunctionPointerVariableFinal("finalFunc", new DataObject().setFunctionPointer(new FunctionPointerObject((interpreter, argumentList, INNER_SCOPE_ID) -> {
81-
return new DataObject().setInt(-42);
81+
return createDataObject(-42);
8282
})));
8383

8484
DataObject ret = callPredefinedFunction("include", LangUtils.separateArgumentsWithArgumentSeparators(
8585
Arrays.asList(
86-
new DataObject("lib.lang"),
87-
new DataObject("Argument1 from ExampleModule")
86+
createDataObject("lib.lang"),
87+
createDataObject("Argument1 from ExampleModule")
8888
)
8989
), SCOPE_ID);
9090

@@ -104,8 +104,8 @@ public DataObject load(List<DataObject> args, final int SCOPE_ID) {
104104

105105
System.out.println("Test calling fn.exampleFunction!");
106106

107-
return new DataObject().setArray(new DataObject[] {
108-
new DataObject("Example module return value (the value at index 1 is from lib.lang)"),
107+
return createDataObject(new DataObject[] {
108+
createDataObject("Example module return value (the value at index 1 is from lib.lang)"),
109109
ret
110110
});
111111
}
@@ -114,7 +114,7 @@ public DataObject load(List<DataObject> args, final int SCOPE_ID) {
114114
public DataObject unload(List<DataObject> args, final int SCOPE_ID) {
115115
System.out.println("ExampleModule is unloading...");
116116

117-
return new DataObject("Good bye!");
117+
return createDataObject("Good bye!");
118118
}
119119

120120
private void printModuleInformation(LangInterpreterInterface lii, final int SCOPE_ID) {

0 commit comments

Comments
 (0)