This is an automated email from the ASF dual-hosted git repository. andy pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/jena.git
commit 3c21ae80fa0c52a63f3948d430432506203c2f7d Author: Andy Seaborne <[email protected]> AuthorDate: Fri Jan 23 09:38:14 2026 +0000 Adjust javacc settings for unicode input --- jena-arq/Grammar/CDTs/cdt_literals.jj | 34 +++++++++++++++-------------- jena-arq/Grammar/JSON/json.jj | 40 ++++++++++++++++++----------------- 2 files changed, 39 insertions(+), 35 deletions(-) diff --git a/jena-arq/Grammar/CDTs/cdt_literals.jj b/jena-arq/Grammar/CDTs/cdt_literals.jj index e25e99aa18..086c9f1c0d 100644 --- a/jena-arq/Grammar/CDTs/cdt_literals.jj +++ b/jena-arq/Grammar/CDTs/cdt_literals.jj @@ -7,15 +7,16 @@ * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * https://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. * - * SPDX-License-Identifier: Apache-2.0 + * SPDX-License-Identifier: Apache-2.0 */ options @@ -23,8 +24,8 @@ options // Use \ u escapes in streams AND use a reader for the query // => get both raw and escaped unicode - JAVA_UNICODE_ESCAPE = true ; - UNICODE_INPUT = false ; + JAVA_UNICODE_ESCAPE = false ; + UNICODE_INPUT = true ; STATIC = false ; // DEBUG_PARSER = true ; @@ -41,15 +42,16 @@ PARSER_BEGIN(CDTLiteralParser) * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * https://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. * - * SPDX-License-Identifier: Apache-2.0 + * SPDX-License-Identifier: Apache-2.0 */ package org.apache.jena.cdt.javacc; diff --git a/jena-arq/Grammar/JSON/json.jj b/jena-arq/Grammar/JSON/json.jj index 3d9d488151..ce371b3960 100644 --- a/jena-arq/Grammar/JSON/json.jj +++ b/jena-arq/Grammar/JSON/json.jj @@ -7,21 +7,22 @@ * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * https://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. * - * SPDX-License-Identifier: Apache-2.0 + * SPDX-License-Identifier: Apache-2.0 */ - + options { - JAVA_UNICODE_ESCAPE = true ; - UNICODE_INPUT = false ; + JAVA_UNICODE_ESCAPE = false ; + UNICODE_INPUT = true ; STATIC = false ; // DEBUG_PARSER = true ; @@ -30,7 +31,7 @@ options PARSER_BEGIN(JSON_Parser) -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -39,17 +40,18 @@ PARSER_BEGIN(JSON_Parser) * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * https://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. * - * SPDX-License-Identifier: Apache-2.0 + * SPDX-License-Identifier: Apache-2.0 */ - + package org.apache.jena.atlas.json.io.parserjavacc.javacc; public class JSON_Parser extends JSON_ParserBase
