Commit 30086e14 authored by Sylvain Schmitz's avatar Sylvain Schmitz

fixed issue in extras

parent 31423f2d
......@@ -35,7 +35,7 @@ fun.arith = element functionCallExpr {
element arguments {
( expr | element argumentPlaceholder { empty } )*
}?
}# BUG? try validating 'substring($base.dir, 1, string-length($base.dir)-1)'
}
fun.string = element functionCallExpr {
element functionName {
......@@ -58,24 +58,27 @@ fun.string = element functionCallExpr {
}?
}
op.extra = element ( eqOp | neOp | equalOp | notEqualOp
| ltOp | leOp | gtOp | geOp
| lessThanOp | lessThanOrEqualOp
| greaterThanOp | greaterThanOrEqualOp ) {
element firstOperand { op.arith },
element secondOperand { op.arith }
}
| element ( eqOp | neOp | equalOp | notEqualOp ) {
element firstOperand { op.string },
element secondOperand { op.string }
}
op.extra = op.arith | op.string |
element ( eqOp | neOp | equalOp | notEqualOp
| ltOp | leOp | gtOp | geOp
| lessThanOp | lessThanOrEqualOp
| greaterThanOp | greaterThanOrEqualOp ) {
element firstOperand { op.arith },
element secondOperand { op.arith }
}
| element ( eqOp | neOp | equalOp | notEqualOp ) {
element firstOperand { op.string },
element secondOperand { op.string }
}
op.arith = element ( addOp | subtractOp | multiplyOp | divOp | idivOp | modOp) {
element firstOperand { op.arith },
element secondOperand { op.arith }
} | fun.arith | varref | num
op.arith = fun.arith | varref | num
| element ( addOp | subtractOp | modOp ) {
element firstOperand { op.arith },
element secondOperand { op.arith }
}
op.string = element stringConcatenateOp {
element firstOperand { op.string },
element secondOperand { op.string }
} | fun.string | varref | str
\ No newline at end of file
op.string = fun.string | varref | str
| element stringConcatenateOp {
element firstOperand { op.string },
element secondOperand { op.string }
}
\ No newline at end of file
......@@ -7,10 +7,10 @@ gains-ext.tex: gains.sh $(wildcard ../../benchmark/*-full.xml)
./gains.sh > gains-ext.tex
non-standard-xquery.xml: nonstandard.pl ../../benchmark/*-full.xml
./nonstandard.pl ../../benchmark/existdb-full.xml ../../benchmark/guidomatic-full.xml ../../benchmark/histei-full.xml ../../benchmark/marklogic-full.xml ../../benchmark/xqjson-full.xml ../../benchmark/xquerydoc-full.xml > non-standard-xquery.xml
./nonstandard.pl `grep 'type="xquery"' ../tex/benchmarks-all-full.xml | sed -e 's/.*href="\([^"]*\).*/\1/'` > non-standard-xquery.xml
non-standard-xslt.xml: nonstandard.pl ../../benchmark/*-full.xml
./nonstandard.pl ../../benchmark/docbook-full.xml ../../benchmark/teixsl-full.xml ../../benchmark/htmlbook-full.xml > non-standard-xslt.xml
./nonstandard.pl `grep 'type="xslt"' ../tex/benchmarks-all-full.xml | sed -e 's/.*href="\([^"]*\).*/\1/'` > non-standard-xslt.xml
%.reasons: %.xml
xmlstarlet sel -t -v '//xpath/schemas/validation[@valid="no" and contains(@schema, "1.0-core-extra")]/text()' -n $*.xml | sort | uniq -c > $*.reasons
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment