mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-11-16 04:38:13 +00:00
Continuing on #3070. I moved ParseTree::Node to just Parse::Node, versus Parse::Tree::Node. Other name changes are just removing "Parse" or "Parser" prefixes. In EnumBase, I'm directly defining operator<< because the ostream.h approach just isn't working, not for either of Parse::State nor Parse::NodeKind. Errors look like: ```toolchain/parser/parser_context.cpp:449:34: error: invalid operands to binary expression ('llvm::raw_ostream' and 'const Carbon::Parse::State') output << "\t" << i << ".\t" << entry.state; ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~ ``` The expected template in `Carbon::` is not in the error list; I only see the: ``` ./common/ostream.h:112:6: note: candidate template ignored: requirement 'std::is_base_of_v<std::ostream, llvm::raw_ostream>' was not satisfied [with S = llvm::raw_ostream, T = Carbon::Parse::State] auto operator<<(S& standard_out, const T& value) -> S& { ^ ``` I'm still prodding at this, but not seeing an obvious fix. --------- Co-authored-by: Richard Smith <richard@metafoo.co.uk>
34 lines
1.0 KiB
C++
34 lines
1.0 KiB
C++
// Part of the Carbon Language project, under the Apache License v2.0 with LLVM
|
|
// Exceptions. See /LICENSE for license information.
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
|
|
#ifndef CARBON_TOOLCHAIN_PARSER_PARSER_STATE_H_
|
|
#define CARBON_TOOLCHAIN_PARSER_PARSER_STATE_H_
|
|
|
|
#include <cstdint>
|
|
|
|
#include "common/enum_base.h"
|
|
|
|
namespace Carbon::Parse {
|
|
|
|
CARBON_DEFINE_RAW_ENUM_CLASS(State, uint8_t) {
|
|
#define CARBON_PARSE_STATE(Name) CARBON_RAW_ENUM_ENUMERATOR(Name)
|
|
#include "toolchain/parser/parser_state.def"
|
|
};
|
|
|
|
class State : public CARBON_ENUM_BASE(State) {
|
|
public:
|
|
#define CARBON_PARSE_STATE(Name) CARBON_ENUM_CONSTANT_DECLARATION(Name)
|
|
#include "toolchain/parser/parser_state.def"
|
|
};
|
|
|
|
#define CARBON_PARSE_STATE(Name) CARBON_ENUM_CONSTANT_DEFINITION(State, Name)
|
|
#include "toolchain/parser/parser_state.def"
|
|
|
|
// We expect State to fit compactly into 8 bits.
|
|
static_assert(sizeof(State) == 1, "State includes padding!");
|
|
|
|
} // namespace Carbon::Parse
|
|
|
|
#endif // CARBON_TOOLCHAIN_PARSER_PARSER_STATE_H_
|