From 3a41065a27fc4e65d563ae983a06cbe774ad2ea7 Mon Sep 17 00:00:00 2001 From: Thomas Lively Date: Tue, 6 Feb 2024 14:05:27 -0800 Subject: Properly stringify names in tests (#6279) Update identifiers used in tests to use a format supported by the new text parser, i.e. either the standard format with its limited set of allowed characters or the non-standard `$"..."` format. Notably, any name containing square or curly braces now uses the string format. Input automatically updated with this script: https://gist.github.com/tlively/4e22311736661849e641d02e521a0748 The printer is updated to properly escape names in more places as well. The logic for escaping names is moved to a common location so that the type printing logic in wasm-type.cpp can use it as well. --- src/support/name.cpp | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 src/support/name.cpp (limited to 'src/support/name.cpp') diff --git a/src/support/name.cpp b/src/support/name.cpp new file mode 100644 index 000000000..4e53e3f83 --- /dev/null +++ b/src/support/name.cpp @@ -0,0 +1,56 @@ +/* + * Copyright 2024 WebAssembly Community Group participants + * + * Licensed under the Apache License, Version 2.0 (the "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 + * + * 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. + */ + +#include +#include + +#include "support/name.h" +#include "support/string.h" + +namespace wasm { + +// TODO: Use unicode rather than char. +bool Name::isIDChar(char c) { + if ('0' <= c && c <= '9') { + return true; + } + if ('A' <= c && c <= 'Z') { + return true; + } + if ('a' <= c && c <= 'z') { + return true; + } + static std::array otherIDChars = { + {'!', '#', '$', '%', '&', '\'', '*', '+', '-', '.', '/', ':', + '<', '=', '>', '?', '@', '\\', '^', '_', '`', '|', '~'}}; + return std::find(otherIDChars.begin(), otherIDChars.end(), c) != + otherIDChars.end(); +} + +std::ostream& Name::print(std::ostream& o) const { + assert(*this && "Cannot print an empty name"); + // We need to quote names if they have tricky chars. + // TODO: This is not spec-compliant since the spec does not yet support + // quoted identifiers and has a limited set of valid idchars. + o << '$'; + if (std::all_of(str.begin(), str.end(), isIDChar)) { + return o << str; + } else { + return String::printEscaped(o, str); + } +} + +} // namespace wasm -- cgit v1.2.3