format

sh/checkStyle.sh

@@ -16,7 +16,7 @@ cd "$(git rev-parse --show-toplevel)"
 
 # Find all changed files in the diff
 for f in $(git diff --name-only --diff-filter=ACMRTUXB $1); do
-  if echo "$f" | egrep -q "[.](cpp|h)$"; then
+  if echo "$f" | grep -E -q "[.](cpp|h)$"; then
     $CLANGFORMAT -style=file "$f" -i
     d=$(git diff --minimal --color=always --ws-error-highlight=all $f) || true
     if [ -n "$d" ]; then
@@ -27,7 +27,7 @@ for f in $(git diff --name-only --diff-filter=ACMRTUXB $1); do
       echo
       fail=1
     fi
-  elif echo "$f" | egrep -q "[.](dl)$"; then
+  elif echo "$f" | grep -E -q "[.](dl)$"; then
     sed -i 's/[ \t]*$//' "$f" || true
     d=$(git diff --minimal --color=always --ws-error-highlight=all $f) || true
     if [ -n "$d" ]; then

src/ast/transform/MaterializeAggregationQueries.cpp

@@ -349,8 +349,8 @@ bool MaterializeAggregationQueriesTransformer::materializeAggregationQueries(
             VecOwn<Literal> newBody;
             newBody.push_back(std::move(aggAtom));
             VecOwn<Literal> oldBody = agg.setBodyLiterals(std::move(newBody));
-            oldBodyLiterals.insert(oldBodyLiterals.end(), std::make_move_iterator(oldBody.begin()), 
-                std::make_move_iterator(oldBody.end()));
+            oldBodyLiterals.insert(oldBodyLiterals.end(), std::make_move_iterator(oldBody.begin()),
+                    std::make_move_iterator(oldBody.end()));
             // Now we can just add these new things (relation and its single clause) to the program
             program.addClause(std::move(aggClause));
             program.addRelation(std::move(aggRel));

tests/semantic/issue1896/issue1896.dl

@@ -6,7 +6,7 @@
 .decl epce(A:symbol, B:symbol, C:symbol)
 .decl utfi(A:symbol, B:number, C:symbol)
 
-linj(A) :- wisb(B, A), A > min AAA : { wisb(CCC, AAA), wisb(BBB, AAA), fwnb(BBB), to_number("-10") = AAA}. 
+linj(A) :- wisb(B, A), A > min AAA : { wisb(CCC, AAA), wisb(BBB, AAA), fwnb(BBB), to_number("-10") = AAA}.
 utfi(C, min(A*A*A,0), B), folv(B, B), ocfz(B, A) :- linj(A), fwnb(C), epce(C, B, B),  A = count : {epce(AAA, AAA, AAA), AxF="GnBBBBB", AAA=substr(AxF,0,1)}.
 .output utfi()
 .output linj()