Skip to content

Replace CommandArgumentType with ValueSerializer in rpc #539

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

Merged
mquinson merged 2 commits into from
Jul 14, 2026
Merged

Replace CommandArgumentType with ValueSerializer in rpc #539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4faf32
Use ValueSerializer for rpc communication
Wyrdix Jul 13, 2026
4e01d3b
Remove CommandArgumentType.java
Wyrdix Jul 13, 2026
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
26 changes: 17 additions & 9 deletions lib/resources/langages/java/Remote.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
import java.util.Locale;
import java.util.Vector;

import java.awt.Color;
import static ValueSerializer.*;

public abstract class Remote {

/*
Expand Down Expand Up @@ -50,31 +53,36 @@ private static void getAnswerLine() {

public static int getAnswerInt() {
getAnswerLine();
return Integer.parseInt(answerBuffer);
return (int) deserialize(answerBuffer);
}

public static boolean getAnswerBoolean() {
return getAnswerInt() == 1;
getAnswerLine();
return (boolean) deserialize(answerBuffer);
}


public static double getAnswerDouble() {
getAnswerLine();
return Double.parseDouble(answerBuffer);
return (double) deserialize(answerBuffer);
}

public static Color getAnswerColor() {
getAnswerLine();
return (Color) deserialize(answerBuffer);
}

public static String getAnswerString() {
getAnswerLine();
return answerBuffer;
return (String) deserialize(answerBuffer);
}

public static char getAnswerChar() {
getAnswerLine();
return answerBuffer.charAt(0);
getAnswerLine();
return (char) deserialize(answerBuffer);
}

public static void sendCommand(String format, Object... args) {
String command = String.format(Locale.ENGLISH, format, args);
public static void sendCommand(String opCode, String name, Object... args) {
String command = opCode+" "+serialize(args)+" "+name;

// System.out.println("Student sends: " + command);
System.out.flush();
Expand Down
88 changes: 44 additions & 44 deletions src/plm/core/lang/LangC.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package plm.core.lang;

import plm.core.PLMCompilerException;
import plm.core.lang.primitives.CommandArgumentType;
import plm.core.lang.primitives.ExternalPrimitiveLanguage;
import plm.core.lang.primitives.PrimitiveMethod;
import plm.core.lang.primitives.PrimitiveParameter;
Expand All @@ -13,8 +12,10 @@
import plm.core.model.session.SourceFile;
import plm.core.ui.ResourcesCache;
import plm.universe.CommandExecutor;
import plm.universe.Direction;
import plm.universe.Entity;

import java.awt.*;
import java.io.*;
import java.nio.file.Files;
import java.util.List;
Expand Down Expand Up @@ -185,13 +186,13 @@ private void compile(String code, String executable, Exercise exo) throws PLMCom
arg1[0] = "cmd.exe";
arg1[1] = "/c";
arg1[2] =
"gcc -g -x c -Wall -lm -lpthread -fsanitize=address -o \"" + exec + "\" " + compiled_code_name;
"gcc -g -x c -Wall -lm -lpthread -fsanitize=address -o \"" + exec + "\" " + compiled_code_name;
} else {
arg1 = new String[3];
arg1[0] = "/bin/sh";
arg1[1] = "-c";
arg1[2] =
"gcc -g -x c -Wall -lm -lpthread -fsanitize=address -o \"" + exec + "\" " + compiled_code_name;
"gcc -g -x c -Wall -lm -lpthread -fsanitize=address -o \"" + exec + "\" " + compiled_code_name;
}

final Process process = runtime.exec(arg1);
Expand Down Expand Up @@ -384,29 +385,29 @@ public void run() {

public static class LangCExternalPrimitiveGenerator implements ExternalPrimitiveLanguage {

String getLanguageType(CommandArgumentType<?> type) {
if (type == CommandArgumentType.COLOR) return "Color";
if (type == CommandArgumentType.DIRECTION) return "Direction";
if (type == CommandArgumentType.DOUBLE) return "double";
if (type == CommandArgumentType.INT) return "int";
if (type == CommandArgumentType.STRING) return "char*";
if (type == CommandArgumentType.CHAR) return "char";
if (type == CommandArgumentType.BOOLEAN)
return "int";
String getLanguageType(Class<?> type) {
if (type == Color.class) return "Color";
if (type == Direction.class) return "Direction";
if (type == Double.class || type == double.class) return "double";
if (type == Integer.class || type == int.class) return "int";
if (type == String.class) return "char*";
if (type == Character.class || type == char.class) return "char";
if (type == Boolean.class || type == boolean.class)
return "int";

throw new IllegalStateException("Unknown type: " + type);
}

String getTypeDeclaration(CommandArgumentType<?> type) {
if (type == CommandArgumentType.DIRECTION) {
String getTypeDeclaration(Class<?> type) {
if (type == Direction.class) {
return "typedef enum{\n" +
" NORTH,\n" +
" EAST,\n" +
" SOUTH,\n" +
" WEST\n" +
"} Direction;";
}
if (type == CommandArgumentType.COLOR) {
if (type == Color.class) {
return "typedef enum{\n" +
" white,\n" +
" black,\n" +
Expand All @@ -433,39 +434,38 @@ String getParameter(PrimitiveParameter parameter) {
String getPrototype(PrimitiveMethod method) {
String name = method.name();
List<PrimitiveParameter> parameters = method.parameters();
CommandArgumentType<?> output = method.output();

Class<?> output = method.output();

final String outputString = Optional.ofNullable(output).map(this::getLanguageType).orElse("void");

return outputString + " " + name + "(" + parameters.stream().map(this::getParameter).collect(Collectors.joining(", ")) + ");";
}

String getReturning(CommandArgumentType<?> type) {
String getReturning(Class<?> type) {
if (type == null)
return "";

if (type == CommandArgumentType.STRING) return "get_answer_string()";
if (type == CommandArgumentType.DOUBLE) return "get_answer_double()";
if (type == CommandArgumentType.CHAR) return "get_answer_char()";
if (type == CommandArgumentType.COLOR) return "get_answer_int()";
if (type == CommandArgumentType.DIRECTION) return "get_answer_int()";
if (type == CommandArgumentType.INT) return "get_answer_int()";
if (type == CommandArgumentType.BOOLEAN)
return "get_answer_int()";
if (type == String.class) return "get_answer_string()";
if (type == Double.class || type == double.class) return "get_answer_double()";
if (type == Character.class || type == char.class) return "get_answer_char()";
if (type == Color.class) return "get_answer_int()";
if (type == Direction.class) return "get_answer_int()";
if (type == Integer.class || type == int.class) return "get_answer_int()";
if (type == Boolean.class || type == boolean.class)
return "get_answer_int()";

throw new IllegalStateException("Unknown type: " + type);
}

String getTemplatingForType(CommandArgumentType<?> type) {
if (type == CommandArgumentType.STRING) return "%s";
if (type == CommandArgumentType.DOUBLE) return "%lf";
if (type == CommandArgumentType.CHAR) return "%c";
if (type == CommandArgumentType.COLOR) return "%d";
if (type == CommandArgumentType.DIRECTION) return "%d";
if (type == CommandArgumentType.INT) return "%d";
if (type == CommandArgumentType.BOOLEAN)
return "%d";
String getTemplatingForType(Class<?> type) {
if (type == String.class) return "%s";
if (type == Double.class || type == double.class) return "%lf";
if (type == Character.class || type == char.class) return "%c";
if (type == Color.class) return "%d";
if (type == Direction.class) return "%d";
if (type == Integer.class || type == int.class) return "%d";
if (type == Boolean.class || type == boolean.class)
return "%d";

throw new IllegalStateException("Unknown type: " + type);
}
Expand All @@ -482,26 +482,26 @@ String getImplementation(PrimitiveMethod method) {
String command = "\tsend_command(\"" + id + " " +
formats
+ name
+ "\"" + method.parameters().stream().map(PrimitiveParameter::name).map(s -> ", "+s).collect(Collectors.joining()) + ");";
+ "\"" + method.parameters().stream().map(PrimitiveParameter::name).map(s -> ", " + s).collect(Collectors.joining()) + ");";

String returning = method.output() != null ? "\treturn " + getReturning(method.output()) + ";" : "";
String returning = method.hasReturn() ? "\treturn " + getReturning(method.output()) + ";" : "";

return prototype + "{\n" + command + "\n" + returning + "\n}";
}

@Override
public void generate(File folder, String name, List<PrimitiveMethod> methods) throws IOException {
Set<CommandArgumentType<?>> involved = ExternalPrimitiveLanguage.involved(methods);
Set<Class<?>> involved = ExternalPrimitiveLanguage.involved(methods);

final String guard = name.toUpperCase() + "_H";

final String header_prefix = "/* THIS FILE IS GENERATED. DO NOT EDIT */\n#ifndef " + guard + "\n"
+ "#define " + guard + "\n"
+ "\n"
+ "#include <stdio.h>\n"
+ "#include <stdlib.h>\n"
+ "#include <stdarg.h>\n"
+ "#include <string.h>";
+ "#define " + guard + "\n"
+ "\n"
+ "#include <stdio.h>\n"
+ "#include <stdlib.h>\n"
+ "#include <stdarg.h>\n"
+ "#include <string.h>";
final String header_suffix = "#endif";

final String type_declarations = involved.stream().map(this::getTypeDeclaration)
Expand Down
Loading
Loading