From 3325d83335599b571481f2e6947eb835fedc5366 Mon Sep 17 00:00:00 2001 From: anquetil Date: Tue, 25 Aug 2026 17:30:18 +0200 Subject: [PATCH 1/2] creating another enum from constants --- .../sparql/triple/javacc1/sparql_corese.jj | 10 ++--- .../core/sparql/triple/parser/ASTQuery.java | 38 +++++++++---------- 2 files changed, 22 insertions(+), 26 deletions(-) diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/javacc1/sparql_corese.jj b/src/main/java/fr/inria/corese/core/sparql/triple/javacc1/sparql_corese.jj index 1d8e558c1..095d72925 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/javacc1/sparql_corese.jj +++ b/src/main/java/fr/inria/corese/core/sparql/triple/javacc1/sparql_corese.jj @@ -367,7 +367,7 @@ void UpdateQuery(Metadata la) : { } { { - astq.setResultForm(ASTQuery.QT_UPDATE); + astq.setResultForm(ASTQuery.ResultForm.QT_UPDATE); astq.set(astu); astu.defProlog(); } @@ -797,7 +797,7 @@ Exp SelectQuery(Metadata la) : { Exp stack; } stack = WhereClause() SolutionModifier() { - astq.setResultForm(ASTQuery.QT_SELECT); + astq.setResultForm(ASTQuery.ResultForm.QT_SELECT); return stack; } } @@ -864,7 +864,7 @@ Exp DescribeQuery(Metadata la) : { Exp stack; Variable v; String s; Atom at;} ( LOOKAHEAD(2) stack = WhereClause() )? SolutionModifier() { - astq.setResultForm(ASTQuery.QT_DESCRIBE); + astq.setResultForm(ASTQuery.ResultForm.QT_DESCRIBE); astq.setAnnotation(la); return stack; } @@ -878,7 +878,7 @@ Exp AskQuery(Metadata la) : { Exp stack; Values values;} (values = Values() {astq.setValues(values); } ) ? { - astq.setResultForm(ASTQuery.QT_ASK); + astq.setResultForm(ASTQuery.ResultForm.QT_ASK); astq.setAnnotation(la); return stack; } @@ -891,7 +891,7 @@ Exp DeleteQuery() : { Exp stack; } stack = WhereClause() { astq.setDelete(true); - astq.setResultForm(ASTQuery.QT_DELETE); + astq.setResultForm(ASTQuery.ResultForm.QT_DELETE); return stack; } } diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/ASTQuery.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/ASTQuery.java index 9ce2f021f..926efe4ed 100755 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/ASTQuery.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/ASTQuery.java @@ -78,13 +78,9 @@ public class ASTQuery static final String NL = "\n"; static int nbt = 0; // to generate an unique id for a triple if needed static int nbbnode = 0; // createBlankNode() - public final static int QT_SELECT = 0; - public final static int QT_ASK = 1; - public final static int QT_CONSTRUCT = 2; - public final static int QT_DESCRIBE = 3; - public final static int QT_DELETE = 4; - public final static int QT_UPDATE = 5; - public final static int QT_TEMPLATE = 6; + + public enum ResultForm { QT_SELECT, QT_ASK, QT_CONSTRUCT, QT_DESCRIBE, QT_DELETE, QT_UPDATE, QT_TEMPLATE } + public final static int L_PATH = 2; public final static int L_LIST = 1; public final static int L_DEFAULT = 0; @@ -159,7 +155,7 @@ public class ASTQuery int nbtriple = 0; // rdf* int nbd = 0; // to generate an unique id for a variable if needed int nbfun = 0, nbvar = 0; - int resultForm = QT_SELECT; + ResultForm resultForm = ResultForm.QT_SELECT; private int priority = 100; int countVar = 0; // if more, reject 2 times worse projection than best one @@ -1926,11 +1922,11 @@ public void setOffset(int offset) { Offset = offset; } - public int getResultForm() { + public ResultForm getResultForm() { return resultForm; } - public void setResultForm(int resultForm) { + public void setResultForm(ResultForm resultForm) { this.resultForm = resultForm; } @@ -2013,7 +2009,7 @@ public Variable newBlankNode(Exp exp, String label) { public void setDescribe(Atom at) { - setResultForm(QT_DESCRIBE); + setResultForm(ResultForm.QT_DESCRIBE); for (Atom aa : adescribe) { if (aa.getLabel().equals(at.getLabel())) { return; @@ -2242,20 +2238,20 @@ boolean checkTripleList(Exp body) { } public void setConstruct(Exp constructExp) { - this.setResultForm(QT_CONSTRUCT); + this.setResultForm(ResultForm.QT_CONSTRUCT); this.constructExp = constructExp; } public void setDelete(boolean b) { if (b) { - setResultForm(QT_DELETE); + setResultForm(ResultForm.QT_DELETE); isDelete = b; } } public void setInsert(boolean b) { if (b) { - setResultForm(ASTQuery.QT_CONSTRUCT); + setResultForm(ResultForm.QT_CONSTRUCT); setAdd(true); } } @@ -2627,7 +2623,7 @@ void setReverse(List list) { public void setAsk(boolean b) { if (b) { - setResultForm(QT_ASK); + setResultForm(ResultForm.QT_ASK); } } @@ -2640,26 +2636,26 @@ public boolean isTemplate() { } public boolean isDescribe() { - return (getResultForm() == QT_DESCRIBE); + return (getResultForm() == ResultForm.QT_DESCRIBE); } public boolean isAsk() { - return (getResultForm() == QT_ASK); + return (getResultForm() == ResultForm.QT_ASK); } @Override public boolean isConstruct() { - return (getResultForm() == QT_CONSTRUCT); + return (getResultForm() == ResultForm.QT_CONSTRUCT); } @Override public boolean isSelect() { - return (getResultForm() == QT_SELECT); + return (getResultForm() == ResultForm.QT_SELECT); } @Override public boolean isUpdate() { - return (getResultForm() == QT_UPDATE); + return (getResultForm() == ResultForm.QT_UPDATE); } @Override @@ -2725,7 +2721,7 @@ public HashMap getSelectFunctions() { } public void set(ASTUpdate u) { - setResultForm(ASTQuery.QT_UPDATE); + setResultForm(ResultForm.QT_UPDATE); astu = u; u.set(this); } From af43a1794c22ed14d499a1cbca3fa296f4683f89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20C=C3=A9r=C3=A8s?= Date: Thu, 27 Aug 2026 10:38:27 +0200 Subject: [PATCH 2/2] refactor(sparql): use idiomatic ResultForm enum values and update JavaCC grammar --- .../sparql/triple/javacc1/sparql_corese.jj | 10 +++---- .../core/sparql/triple/parser/ASTQuery.java | 28 ++++++++++--------- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/javacc1/sparql_corese.jj b/src/main/java/fr/inria/corese/core/sparql/triple/javacc1/sparql_corese.jj index 095d72925..d66e9772d 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/javacc1/sparql_corese.jj +++ b/src/main/java/fr/inria/corese/core/sparql/triple/javacc1/sparql_corese.jj @@ -367,7 +367,7 @@ void UpdateQuery(Metadata la) : { } { { - astq.setResultForm(ASTQuery.ResultForm.QT_UPDATE); + astq.setResultForm(ASTQuery.ResultForm.UPDATE); astq.set(astu); astu.defProlog(); } @@ -797,7 +797,7 @@ Exp SelectQuery(Metadata la) : { Exp stack; } stack = WhereClause() SolutionModifier() { - astq.setResultForm(ASTQuery.ResultForm.QT_SELECT); + astq.setResultForm(ASTQuery.ResultForm.SELECT); return stack; } } @@ -864,7 +864,7 @@ Exp DescribeQuery(Metadata la) : { Exp stack; Variable v; String s; Atom at;} ( LOOKAHEAD(2) stack = WhereClause() )? SolutionModifier() { - astq.setResultForm(ASTQuery.ResultForm.QT_DESCRIBE); + astq.setResultForm(ASTQuery.ResultForm.DESCRIBE); astq.setAnnotation(la); return stack; } @@ -878,7 +878,7 @@ Exp AskQuery(Metadata la) : { Exp stack; Values values;} (values = Values() {astq.setValues(values); } ) ? { - astq.setResultForm(ASTQuery.ResultForm.QT_ASK); + astq.setResultForm(ASTQuery.ResultForm.ASK); astq.setAnnotation(la); return stack; } @@ -891,7 +891,7 @@ Exp DeleteQuery() : { Exp stack; } stack = WhereClause() { astq.setDelete(true); - astq.setResultForm(ASTQuery.ResultForm.QT_DELETE); + astq.setResultForm(ASTQuery.ResultForm.DELETE); return stack; } } diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/ASTQuery.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/ASTQuery.java index 926efe4ed..112afd77b 100755 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/ASTQuery.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/ASTQuery.java @@ -79,7 +79,9 @@ public class ASTQuery static int nbt = 0; // to generate an unique id for a triple if needed static int nbbnode = 0; // createBlankNode() - public enum ResultForm { QT_SELECT, QT_ASK, QT_CONSTRUCT, QT_DESCRIBE, QT_DELETE, QT_UPDATE, QT_TEMPLATE } + public enum ResultForm { + SELECT, ASK, CONSTRUCT, DESCRIBE, DELETE, UPDATE, TEMPLATE + } public final static int L_PATH = 2; public final static int L_LIST = 1; @@ -155,7 +157,7 @@ public enum ResultForm { QT_SELECT, QT_ASK, QT_CONSTRUCT, QT_DESCRIBE, QT_DELETE int nbtriple = 0; // rdf* int nbd = 0; // to generate an unique id for a variable if needed int nbfun = 0, nbvar = 0; - ResultForm resultForm = ResultForm.QT_SELECT; + ResultForm resultForm = ResultForm.SELECT; private int priority = 100; int countVar = 0; // if more, reject 2 times worse projection than best one @@ -2009,7 +2011,7 @@ public Variable newBlankNode(Exp exp, String label) { public void setDescribe(Atom at) { - setResultForm(ResultForm.QT_DESCRIBE); + setResultForm(ResultForm.DESCRIBE); for (Atom aa : adescribe) { if (aa.getLabel().equals(at.getLabel())) { return; @@ -2238,20 +2240,20 @@ boolean checkTripleList(Exp body) { } public void setConstruct(Exp constructExp) { - this.setResultForm(ResultForm.QT_CONSTRUCT); + this.setResultForm(ResultForm.CONSTRUCT); this.constructExp = constructExp; } public void setDelete(boolean b) { if (b) { - setResultForm(ResultForm.QT_DELETE); + setResultForm(ResultForm.DELETE); isDelete = b; } } public void setInsert(boolean b) { if (b) { - setResultForm(ResultForm.QT_CONSTRUCT); + setResultForm(ResultForm.CONSTRUCT); setAdd(true); } } @@ -2623,7 +2625,7 @@ void setReverse(List list) { public void setAsk(boolean b) { if (b) { - setResultForm(ResultForm.QT_ASK); + setResultForm(ResultForm.ASK); } } @@ -2636,26 +2638,26 @@ public boolean isTemplate() { } public boolean isDescribe() { - return (getResultForm() == ResultForm.QT_DESCRIBE); + return (getResultForm() == ResultForm.DESCRIBE); } public boolean isAsk() { - return (getResultForm() == ResultForm.QT_ASK); + return (getResultForm() == ResultForm.ASK); } @Override public boolean isConstruct() { - return (getResultForm() == ResultForm.QT_CONSTRUCT); + return (getResultForm() == ResultForm.CONSTRUCT); } @Override public boolean isSelect() { - return (getResultForm() == ResultForm.QT_SELECT); + return (getResultForm() == ResultForm.SELECT); } @Override public boolean isUpdate() { - return (getResultForm() == ResultForm.QT_UPDATE); + return (getResultForm() == ResultForm.UPDATE); } @Override @@ -2721,7 +2723,7 @@ public HashMap getSelectFunctions() { } public void set(ASTUpdate u) { - setResultForm(ResultForm.QT_UPDATE); + setResultForm(ResultForm.UPDATE); astu = u; u.set(this); }