Skip to content

Commit

Permalink
Add checkstyle rule to make the line width at most 120 chars (#53)
Browse files Browse the repository at this point in the history
Add checkstyle rule to make the line width at most 120 chars
  • Loading branch information
afroozeh authored Nov 4, 2022
1 parent c3e44cd commit f5634e5
Show file tree
Hide file tree
Showing 90 changed files with 3,583 additions and 2,563 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/iguana-build.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Java CI with Maven
name: Iguana build

on:
push:
Expand Down
21 changes: 14 additions & 7 deletions src/org/iguana/Iguana.java
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ static class Command {
@Option(names = "--package", description = "package name for the generated code")
private String packageName;

@Option(names = {"--grammar-output"}, description = "The location where the grammar.json file will be generated.", required = true)
@Option(names = {"--grammar-output"}, description = "The location where the grammar.json file will be generated.",
required = true)
private Path grammarOutputDirectory;

public static void main(String[] args) {
Expand All @@ -63,24 +64,30 @@ public Integer call() throws Exception {
JsonSerializer.serialize(grammar, jsonPath);
System.out.println("grammar.json file has been generated in " + jsonPath);
Path typesOutputDirectory = outputDirectory.resolve(packageName.replace(".", "/"));
ParserGenerator parserGenerator = new ParserGenerator(grammarName, packageName, typesOutputDirectory.toAbsolutePath().toString());
ParserGenerator parserGenerator = new ParserGenerator(grammarName, packageName,
typesOutputDirectory.toAbsolutePath().toString());
parserGenerator.generateGrammar();
}

if (command.generateTypes) {
Path typesOutputDirectory = outputDirectory.resolve(packageName.replace(".", "/"));
ParserGenerator parserGenerator = new ParserGenerator(grammarName, packageName, typesOutputDirectory.toAbsolutePath().toString());
ParserGenerator parserGenerator = new ParserGenerator(grammarName, packageName,
typesOutputDirectory.toAbsolutePath().toString());
parserGenerator.generateParser();
ParseTreeVisitorGenerator generator = new ParseTreeVisitorGenerator(grammar.toRuntimeGrammar(), grammarName, packageName, typesOutputDirectory.toAbsolutePath().toString());
ParseTreeVisitorGenerator generator = new ParseTreeVisitorGenerator(grammar.toRuntimeGrammar(), grammarName,
packageName, typesOutputDirectory.toAbsolutePath().toString());
generator.generate();
}

if (command.generateIDE) {
GenerateLangFiles generateLangFiles = new GenerateLangFiles(grammarName, outputDirectory.toAbsolutePath().toString());
GenerateLangFiles generateLangFiles = new GenerateLangFiles(grammarName,
outputDirectory.toAbsolutePath().toString());
generateLangFiles.generate();
GeneratePsiElements generatePSIElements = new GeneratePsiElements(grammar.toRuntimeGrammar(), grammarName, packageName, outputDirectory.toAbsolutePath().toString());
GeneratePsiElements generatePSIElements = new GeneratePsiElements(grammar.toRuntimeGrammar(), grammarName,
packageName, outputDirectory.toAbsolutePath().toString());
generatePSIElements.generate();
GenerateParserFiles generateParserFiles = new GenerateParserFiles(grammar.toRuntimeGrammar(), grammarName, packageName, outputDirectory.toAbsolutePath().toString());
GenerateParserFiles generateParserFiles = new GenerateParserFiles(grammar.toRuntimeGrammar(), grammarName,
packageName, outputDirectory.toAbsolutePath().toString());
generateParserFiles.generate();
}

Expand Down
12 changes: 7 additions & 5 deletions src/org/iguana/datadependent/ast/AST.java
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ public Object interpret(IEvaluatorContext ctx, Input input) {
}
}

public static Indent indent(Expression...args) {
public static Indent indent(Expression... args) {
if (args.length != 1) throw new RuntimeException("args size should be one");
return indent(args[0]);
}
Expand All @@ -189,7 +189,8 @@ public Object interpret(IEvaluatorContext ctx, Input input) {

NonPackedNode node = (NonPackedNode) var;

ctx.declareGlobalVariable(input.subString(node.getLeftExtent(), node.getRightExtent()), value.interpret(ctx, input));
ctx.declareGlobalVariable(input.subString(node.getLeftExtent(), node.getRightExtent()),
value.interpret(ctx, input));

return null;
}
Expand Down Expand Up @@ -379,7 +380,7 @@ public Object interpret(IEvaluatorContext ctx, Input input) {
}

public static Pr1 pr1(Expression arg1, Expression arg2, Expression arg3) {
return new Pr1(arg1, arg2, arg3);
return new Pr1(arg1, arg2, arg3);
}

public static class Pr2 extends Expression.Call {
Expand Down Expand Up @@ -575,7 +576,7 @@ public Object interpret(IEvaluatorContext ctx, Input input) {
}
}

public static Contains contains(Expression...args) {
public static Contains contains(Expression... args) {
if (args.length != 2) throw new RuntimeException("args size should be two");
return contains(args[0], args[1]);
}
Expand Down Expand Up @@ -684,7 +685,8 @@ public Object interpret(IEvaluatorContext ctx, Input input) {
throw new UnexpectedTypeOfArgumentException(this);

@SuppressWarnings("unchecked")
Stack<java.util.Map<java.lang.String, java.lang.Boolean>> s = (Stack<java.util.Map<java.lang.String, java.lang.Boolean>>) value;
Stack<java.util.Map<java.lang.String, java.lang.Boolean>> s =
(Stack<java.util.Map<java.lang.String, java.lang.Boolean>>) value;

java.lang.String key = (java.lang.String) arguments[0].interpret(ctx, input);

Expand Down
19 changes: 13 additions & 6 deletions src/org/iguana/datadependent/ast/Expression.java
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,8 @@ public Object interpret(IEvaluatorContext ctx, Input input) {

@Override
public java.lang.String toString() {
return "(" + listToString(Arrays.stream(elements).map(Object::toString).collect(Collectors.toList()), ",") + ")";
return "(" + listToString(Arrays.stream(elements).map(Object::toString)
.collect(Collectors.toList()), ",") + ")";
}

@Override
Expand Down Expand Up @@ -519,7 +520,8 @@ public Object interpret(IEvaluatorContext ctx, Input input) {

@Override
public java.lang.String toString() {
return i != -1 ? java.lang.String.format("%s:%s = %s", id, i, exp) : java.lang.String.format("%s = %s", id, exp);
return i != -1 ? java.lang.String.format("%s:%s = %s", id, i, exp)
: java.lang.String.format("%s = %s", id, exp);
}

@Override
Expand Down Expand Up @@ -659,7 +661,8 @@ public Object interpret(IEvaluatorContext ctx, Input input) {

@Override
public java.lang.String toString() {
// return ind + " == 0 || (" + first + " && " + lExt + " - " + index + " == 0) || indent(" + lExt + ") > " + ind;
// return ind + " == 0 || (" + first + " && " + lExt + " - " + index + " == 0) ||
// indent(" + lExt + ") > " + ind;
return java.lang.String.format("f(%s,%s,%s,%s)", index, ind, first, lExt);
}

Expand Down Expand Up @@ -796,7 +799,9 @@ public boolean equals(Object obj) {
if (this == obj) return true;
if (!(obj instanceof BinaryExpression)) return false;
BinaryExpression other = (BinaryExpression) obj;
return this.lhs.equals(other.lhs) && this.rhs.equals(other.rhs) && Objects.equals(this.symbolName, other.symbolName);
return this.lhs.equals(other.lhs) &&
this.rhs.equals(other.rhs) &&
Objects.equals(this.symbolName, other.symbolName);
}

@Override
Expand Down Expand Up @@ -1276,15 +1281,17 @@ public Object interpret(IEvaluatorContext ctx, Input input) {
return input.subString(node.getLeftExtent(), node.getRightExtent());
} // In case of recognizer, we don't have a node.
else if (value instanceof RecognizerResult) {
return input.subString(((RecognizerResult) value).getLeftExtent(), ((RecognizerResult) value).getRightExtent());
return input.subString(((RecognizerResult) value).getLeftExtent(),
((RecognizerResult) value).getRightExtent());
} else {
throw new UnexpectedTypeOfArgumentException(this);
}
}

@Override
public java.lang.String toString() {
return i == -1 ? java.lang.String.format("%s.yield", label) : java.lang.String.format("%s:%d.yield", label, i);
return i == -1 ? java.lang.String.format("%s.yield", label)
: java.lang.String.format("%s:%d.yield", label, i);
}

@Override
Expand Down
3 changes: 2 additions & 1 deletion src/org/iguana/datadependent/ast/VariableDeclaration.java
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@ public int hashCode() {

@Override
public String toString() {
return expression != null? (i != -1? String.format( "var %s:%s = %s", name, i, expression) : String.format( "var %s = %s", name, expression))
return expression != null? (i != -1? String.format( "var %s:%s = %s", name, i, expression) :
String.format( "var %s = %s", name, expression))
: (i != -1? String.format("var %s:%s", name, i) : String.format("var %s", name));
}

Expand Down
Loading

0 comments on commit f5634e5

Please sign in to comment.