Rename executable_semantics to explorer (#1188)

Change generated with:

```
#!/usr/bin/bash -eux

# Helper script for renaming pending work.
# Run from the repo root.

# Rename executable_semantics in code.
sed -i 's/executable_semantics/explorer/g' \
  $(git grep -l 'executable_semantics' . | grep -v proposals)
sed -i 's/executable semantics/explorer/g' \
  $(git grep -l 'executable semantics' . | grep -v proposals)
sed -i 's/Executable semantics/Explorer/g' \
  $(git grep -l 'Executable semantics' . |  grep -v proposals)
sed -i 's/Executable Semantics/Explorer/g' \
  $(git grep -l 'Executable Semantics' . |  grep -v proposals)
sed -i 's/EXECUTABLE_SEMANTICS/EXPLORER/g' \
  $(git grep -l 'EXECUTABLE_SEMANTICS' . | grep -v proposals)
sed -i 's/ExecutableSemantics/Explorer/g' \
  $(git grep -l 'ExecutableSemantics' . | grep -v proposals)
sed -i 's/executable-semantics/explorer/g' \
  $(git grep -l 'executable-semantics' . | grep -v proposals)

# This is only needed for the initial move.
mv executable_semantics explorer
mv explorer/fuzzing/executable_semantics_fuzzer.cpp explorer/fuzzing/explorer_fuzzer.cpp
```

Verified with `bazel test ...`

.pre-commit-config.yaml

@@ -57,11 +57,11 @@ repos:
         entry: scripts/run_buildifier.py
         language: python
         files: '^(.*/)?(BUILD\.bazel|BUILD|WORKSPACE)$|\.BUILD$|\.bzl$'
-      - id: executable-semantics-format-grammar
-        name: Format the executable_semantics grammar file
-        entry: executable_semantics/syntax/format_grammar.py
+      - id: explorer-format-grammar
+        name: Format the explorer grammar file
+        entry: explorer/syntax/format_grammar.py
         language: python
-        files: ^executable_semantics/syntax/(lexer.lpp|parser.ypp)$
+        files: ^explorer/syntax/(lexer.lpp|parser.ypp)$
         pass_filenames: false
         additional_dependencies: ['clang-format==13.0.1']
       - id: clang-format

README.md

@@ -132,7 +132,7 @@ Learn more about Carbon's design:
 
 -   [Project goals](docs/project/goals.md)
 -   [Language overview](docs/design/)
--   [Executable semantics](executable_semantics/)
+-   [Explorer](explorer/)
 
 ## Join us
 

bazel/check_deps/BUILD

@@ -13,7 +13,7 @@ load("@mypy_integration//:mypy.bzl", "mypy_test")
 filegroup(
     name = "non_test_cc_rules",
     data = [
-        "//executable_semantics",
+        "//explorer",
         "//installers/local:carbon",
         "//migrate_cpp/cpp_refactoring",
         "//toolchain/diagnostics:null_diagnostics",

docs/project/roadmap.md

@@ -45,8 +45,8 @@ and it should be possible to write non-trivial Carbon programs.
 An initial rough framework for the core standard library functionality should be
 provided, as necessary to support the core language components. A largely
 complete implementation of the core language design should be available in
-executable semantics. The toolchain should be able to parse the core language
-design, with some support for name lookup and type-checking.
+explorer. The toolchain should be able to parse the core language design, with
+some support for name lookup and type-checking.
 
 We should have begun writing non-trivial portions of the standard library, such
 as common higher-level data structures and algorithms.
@@ -120,7 +120,7 @@ overarching value proposition.
 
 We should have a clear understanding of the syntax and semantics used by these
 example ports. We should be able to demonstrate that self-contained portions of
-the ported code work correctly using the executable semantics implementation.
+the ported code work correctly using the explorer implementation.
 
 ### Demo implementation of core features with working examples
 
@@ -169,7 +169,7 @@ This should include both a human readable rendering of the formal semantics as
 well as an execution environment to run test cases through those semantics. The
 implementation should cover enough of the core language that example code, such
 as the above ports of woff2 and RE2 and the Carbon standard library, can be
-verified with the executable semantics implementation.
+verified with the explorer implementation.
 
 ## Beyond 2022
 

executable_semantics/testdata/basic_syntax/fail_assign_to_function.carbon

@@ -1,20 +0,0 @@
-// 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
-//
-// RUN: %{not} %{executable_semantics} %s 2>&1 | \
-// RUN:   %{FileCheck} --match-full-lines --allow-unused-prefixes=false %s
-// RUN: %{not} %{executable_semantics} --parser_debug --trace_file=- %s 2>&1 | \
-// RUN:   %{FileCheck} --match-full-lines --allow-unused-prefixes %s
-// AUTOUPDATE: %{executable_semantics} %s
-// CHECK: COMPILATION ERROR: {{.*}}/executable_semantics/testdata/basic_syntax/fail_assign_to_function.carbon:18: Cannot assign to rvalue 'F'
-
-package ExecutableSemanticsTest api;
-
-fn F() {}
-fn G() {}
-
-fn Main() -> i32 {
-  F = G;
-  return 0;
-}

executable_semantics/testdata/basic_syntax/fail_assign_to_rval.carbon

@@ -1,17 +0,0 @@
-// 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
-//
-// RUN: %{not} %{executable_semantics} %s 2>&1 | \
-// RUN:   %{FileCheck} --match-full-lines --allow-unused-prefixes=false %s
-// RUN: %{not} %{executable_semantics} --parser_debug --trace_file=- %s 2>&1 | \
-// RUN:   %{FileCheck} --match-full-lines --allow-unused-prefixes %s
-// AUTOUPDATE: %{executable_semantics} %s
-// CHECK: COMPILATION ERROR: {{.*}}/executable_semantics/testdata/basic_syntax/fail_assign_to_rval.carbon:15: Cannot assign to rvalue '1'
-
-package ExecutableSemanticsTest api;
-
-fn Main() -> i32 {
-  1 = 0;
-  return 0;
-}

executable_semantics/testdata/basic_syntax/fail_invalid_char.carbon

@@ -1,12 +0,0 @@
-// 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
-//
-// RUN: %{not} %{executable_semantics} %s 2>&1 | \
-// RUN:   %{FileCheck} --match-full-lines --allow-unused-prefixes=false %s
-// RUN: %{not} %{executable_semantics} --parser_debug --trace_file=- %s 2>&1 | \
-// RUN:   %{FileCheck} --match-full-lines --allow-unused-prefixes %s
-// AUTOUPDATE: %{executable_semantics} %s
-// CHECK: COMPILATION ERROR: {{.*}}/executable_semantics/testdata/basic_syntax/fail_invalid_char.carbon:12: invalid character '\xEF' in source file.
-
-�

executable_semantics/testdata/basic_syntax/fail_missing_var.carbon

@@ -1,18 +0,0 @@
-// 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
-//
-// RUN: %{not} %{executable_semantics} %s 2>&1 | \
-// RUN:   %{FileCheck} --match-full-lines --allow-unused-prefixes=false %s
-// RUN: %{not} %{executable_semantics} --parser_debug --trace_file=- %s 2>&1 | \
-// RUN:   %{FileCheck} --match-full-lines --allow-unused-prefixes %s
-// AUTOUPDATE: %{executable_semantics} %s
-// CHECK: COMPILATION ERROR: {{.*}}/executable_semantics/testdata/basic_syntax/fail_missing_var.carbon:16: syntax error, unexpected COLON, expecting EQUAL or SEMICOLON
-
-package ExecutableSemanticsTest api;
-
-fn Main() -> i32 {
-  // error
-  x : i32;
-  return 1;
-}

executable_semantics/testdata/basic_syntax/fail_nested_binding.carbon

@@ -1,17 +0,0 @@
-// 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
-//
-// RUN: %{not} %{executable_semantics} %s 2>&1 | \
-// RUN:   %{FileCheck} --match-full-lines --allow-unused-prefixes=false %s
-// RUN: %{not} %{executable_semantics} --parser_debug --trace_file=- %s 2>&1 | \
-// RUN:   %{FileCheck} --match-full-lines --allow-unused-prefixes %s
-// AUTOUPDATE: %{executable_semantics} %s
-// CHECK: COMPILATION ERROR: {{.*}}/executable_semantics/testdata/basic_syntax/fail_nested_binding.carbon:15: The type of a binding pattern cannot contain bindings.
-
-package ExecutableSemanticsTest api;
-
-fn Main() -> i32 {
-  var x: (T: Type) = 1;
-  return 1;
-}

executable_semantics/testdata/function/auto_return/fail_no_return.carbon

@@ -1,19 +0,0 @@
-// 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
-//
-// RUN: %{not} %{executable_semantics} %s 2>&1 | \
-// RUN:   %{FileCheck} --match-full-lines --allow-unused-prefixes=false %s
-// RUN: %{not} %{executable_semantics} --parser_debug --trace_file=- %s 2>&1 | \
-// RUN:   %{FileCheck} --match-full-lines --allow-unused-prefixes %s
-// AUTOUPDATE: %{executable_semantics} %s
-// CHECK: COMPILATION ERROR: {{.*}}/executable_semantics/testdata/function/auto_return/fail_no_return.carbon:15: control-flow reaches end of function that provides a `->` return type without reaching a return statement
-
-package ExecutableSemanticsTest api;
-
-fn NoReturn() -> auto {
-}
-
-fn Main() {
-  NoReturn();
-}

executable_semantics/testdata/function/fail_non_exhaustive_match.carbon

@@ -1,18 +0,0 @@
-// 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
-//
-// RUN: %{not} %{executable_semantics} %s 2>&1 | \
-// RUN:   %{FileCheck} --match-full-lines --allow-unused-prefixes=false %s
-// RUN: %{not} %{executable_semantics} --parser_debug --trace_file=- %s 2>&1 | \
-// RUN:   %{FileCheck} --match-full-lines --allow-unused-prefixes %s
-// AUTOUPDATE: %{executable_semantics} %s
-// CHECK: COMPILATION ERROR: {{.*}}/executable_semantics/testdata/function/fail_non_exhaustive_match.carbon:18: non-exhaustive match may allow control-flow to reach the end of a function that provides a `->` return type
-
-package ExecutableSemanticsTest api;
-
-fn Main() -> i32 {
-  match (0) {
-    case 1 => return 0;
-  }
-}

executable_semantics/testdata/impl/fail_impl_as_not_constraint.carbon

@@ -1,17 +0,0 @@
-// 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
-//
-// RUN: %{not} %{executable_semantics} %s 2>&1 | \
-// RUN:   %{FileCheck} --match-full-lines --allow-unused-prefixes=false %s
-// RUN: %{not} %{executable_semantics} --parser_debug --trace_file=- %s 2>&1 | \
-// RUN:   %{FileCheck} --match-full-lines --allow-unused-prefixes %s
-// AUTOUPDATE: %{executable_semantics} %s
-// CHECK: COMPILATION ERROR: {{.*}}/executable_semantics/testdata/impl/fail_impl_as_not_constraint.carbon:14: expected constraint after `as`, found value of type i32
-
-package ExecutableSemanticsTest api;
-
-external impl i32 as i32 {}
-
-fn Main() -> i32 {
-}

executable_semantics/testdata/import/fail_order.carbon

@@ -1,18 +0,0 @@
-// 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
-//
-// RUN: %{not} %{executable_semantics} %s 2>&1 | \
-// RUN:   %{FileCheck} --match-full-lines --allow-unused-prefixes=false %s
-// RUN: %{not} %{executable_semantics} --parser_debug --trace_file=- %s 2>&1 | \
-// RUN:   %{FileCheck} --match-full-lines --allow-unused-prefixes %s
-// AUTOUPDATE: %{executable_semantics} %s
-// CHECK: COMPILATION ERROR: {{.*}}/executable_semantics/testdata/import/fail_order.carbon:18: syntax error, unexpected IMPORT, expecting END_OF_FILE
-
-package ExecutableSemanticsTest api;
-
-fn Main() -> i32 {
-  return 0;
-}
-
-import ExecutableSemanticsTest library "Nonexistent";

executable_semantics/testdata/let/fail_global_assign.carbon

@@ -1,19 +0,0 @@
-// 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
-//
-// RUN: %{not} %{executable_semantics} %s 2>&1 | \
-// RUN:   %{FileCheck} --match-full-lines --allow-unused-prefixes=false %s
-// RUN: %{not} %{executable_semantics} --parser_debug --trace_file=- %s 2>&1 | \
-// RUN:   %{FileCheck} --match-full-lines --allow-unused-prefixes %s
-// AUTOUPDATE: %{executable_semantics} %s
-// CHECK: COMPILATION ERROR: {{.*}}/executable_semantics/testdata/let/fail_global_assign.carbon:17: Cannot assign to rvalue 'x'
-
-package ExecutableSemanticsTest api;
-
-let x: i32 = 10;
-
-fn Main() -> i32 {
-  x = 0;
-  return 0;
-}

executable_semantics/testdata/let/fail_local_assign.carbon

@@ -1,18 +0,0 @@
-// 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
-//
-// RUN: %{not} %{executable_semantics} %s 2>&1 | \
-// RUN:   %{FileCheck} --match-full-lines --allow-unused-prefixes=false %s
-// RUN: %{not} %{executable_semantics} --parser_debug --trace_file=- %s 2>&1 | \
-// RUN:   %{FileCheck} --match-full-lines --allow-unused-prefixes %s
-// AUTOUPDATE: %{executable_semantics} %s
-// CHECK: COMPILATION ERROR: {{.*}}/executable_semantics/testdata/let/fail_local_assign.carbon:16: Cannot assign to rvalue 'x'
-
-package ExecutableSemanticsTest api;
-
-fn Main() -> i32 {
-  let x: auto = 10;
-  x = 0;
-  return 0;
-}

executable_semantics/testdata/name_lookup/fail_block_duplicate.carbon

@@ -1,18 +0,0 @@
-// 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
-//
-// RUN: %{not} %{executable_semantics} %s 2>&1 | \
-// RUN:   %{FileCheck} --match-full-lines --allow-unused-prefixes=false %s
-// RUN: %{not} %{executable_semantics} --parser_debug --trace_file=- %s 2>&1 | \
-// RUN:   %{FileCheck} --match-full-lines --allow-unused-prefixes %s
-// AUTOUPDATE: %{executable_semantics} %s
-// CHECK: COMPILATION ERROR: {{.*}}/executable_semantics/testdata/name_lookup/fail_block_duplicate.carbon:16: Duplicate name `x` also found at {{.*}}/executable_semantics/testdata/name_lookup/fail_block_duplicate.carbon:15
-
-package ExecutableSemanticsTest api;
-
-fn Main() -> i32 {
-  var x: i32 = 0;
-  var x: i32 = 0;
-  return 0;
-}

executable_semantics/testdata/name_lookup/fail_choice_duplicate.carbon

@@ -1,21 +0,0 @@
-// 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
-//
-// RUN: %{not} %{executable_semantics} %s 2>&1 | \
-// RUN:   %{FileCheck} --match-full-lines --allow-unused-prefixes=false %s
-// RUN: %{not} %{executable_semantics} --parser_debug --trace_file=- %s 2>&1 | \
-// RUN:   %{FileCheck} --match-full-lines --allow-unused-prefixes %s
-// AUTOUPDATE: %{executable_semantics} %s
-// CHECK: COMPILATION ERROR: {{.*}}/executable_semantics/testdata/name_lookup/fail_choice_duplicate.carbon:16: Duplicate name `None` in choice type
-
-package ExecutableSemanticsTest api;
-
-choice Ints {
-  None,
-  None,
-}
-
-fn Main() -> i32 {
-  return 0;
-}

executable_semantics/testdata/name_lookup/fail_class_duplicate.carbon

@@ -1,21 +0,0 @@
-// 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
-//
-// RUN: %{not} %{executable_semantics} %s 2>&1 | \
-// RUN:   %{FileCheck} --match-full-lines --allow-unused-prefixes=false %s
-// RUN: %{not} %{executable_semantics} --parser_debug --trace_file=- %s 2>&1 | \
-// RUN:   %{FileCheck} --match-full-lines --allow-unused-prefixes %s
-// AUTOUPDATE: %{executable_semantics} %s
-// CHECK: COMPILATION ERROR: {{.*}}/executable_semantics/testdata/name_lookup/fail_class_duplicate.carbon:16: Duplicate name `x` also found at {{.*}}/executable_semantics/testdata/name_lookup/fail_class_duplicate.carbon:15
-
-package ExecutableSemanticsTest api;
-
-class Foo {
-  var x: i32;
-  var x: i32;
-}
-
-fn Main() -> i32 {
-  return 0;
-}

executable_semantics/testdata/name_lookup/fail_global_duplicate.carbon

@@ -1,19 +0,0 @@
-// 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
-//
-// RUN: %{not} %{executable_semantics} %s 2>&1 | \
-// RUN:   %{FileCheck} --match-full-lines --allow-unused-prefixes=false %s
-// RUN: %{not} %{executable_semantics} --parser_debug --trace_file=- %s 2>&1 | \
-// RUN:   %{FileCheck} --match-full-lines --allow-unused-prefixes %s
-// AUTOUPDATE: %{executable_semantics} %s
-// CHECK: COMPILATION ERROR: {{.*}}/executable_semantics/testdata/name_lookup/fail_global_duplicate.carbon:15: Duplicate name `x` also found at {{.*}}/executable_semantics/testdata/name_lookup/fail_global_duplicate.carbon:14
-
-package ExecutableSemanticsTest api;
-
-var x: i32 = 0;
-var x: i32 = 0;
-
-fn Main() -> i32 {
-  return 0;
-}

executable_semantics/testdata/name_lookup/fail_match_duplicate.carbon

@@ -1,20 +0,0 @@
-// 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
-//
-// RUN: %{not} %{executable_semantics} %s 2>&1 | \
-// RUN:   %{FileCheck} --match-full-lines --allow-unused-prefixes=false %s
-// RUN: %{not} %{executable_semantics} --parser_debug --trace_file=- %s 2>&1 | \
-// RUN:   %{FileCheck} --match-full-lines --allow-unused-prefixes %s
-// AUTOUPDATE: %{executable_semantics} %s
-// CHECK: COMPILATION ERROR: {{.*}}/executable_semantics/testdata/name_lookup/fail_match_duplicate.carbon:17: Duplicate name `x` also found at {{.*}}/executable_semantics/testdata/name_lookup/fail_match_duplicate.carbon:16
-
-package ExecutableSemanticsTest api;
-
-fn Main() -> i32 {
-  match (0) {
-    case x: i32 =>
-      var x: i32 = 0;
-  }
-  return 0;
-}

executable_semantics/testdata/package/fail_missing.carbon

@@ -1,14 +0,0 @@
-// 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
-//
-// RUN: %{not} %{executable_semantics} %s 2>&1 | \
-// RUN:   %{FileCheck} --match-full-lines --allow-unused-prefixes=false %s
-// RUN: %{not} %{executable_semantics} --parser_debug --trace_file=- %s 2>&1 | \
-// RUN:   %{FileCheck} --match-full-lines --allow-unused-prefixes %s
-// AUTOUPDATE: %{executable_semantics} %s
-// CHECK: COMPILATION ERROR: {{.*}}/executable_semantics/testdata/package/fail_missing.carbon:12: syntax error, unexpected FN, expecting PACKAGE
-
-fn Main() -> i32 {
-  return 0;
-}

executable_semantics/testdata/return/fail_explicit_with_no_return.carbon

@@ -1,20 +0,0 @@
-// 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
-//
-// RUN: %{not} %{executable_semantics} %s 2>&1 | \
-// RUN:   %{FileCheck} --match-full-lines --allow-unused-prefixes=false %s
-// RUN: %{not} %{executable_semantics} --parser_debug --trace_file=- %s 2>&1 | \
-// RUN:   %{FileCheck} --match-full-lines --allow-unused-prefixes %s
-// AUTOUPDATE: %{executable_semantics} %s
-// CHECK: COMPILATION ERROR: {{.*}}/executable_semantics/testdata/return/fail_explicit_with_no_return.carbon:15: control-flow reaches end of function that provides a `->` return type without reaching a return statement
-
-package ExecutableSemanticsTest api;
-
-fn F() -> () {
-}
-
-fn Main() -> i32 {
-  F();
-  return 0;
-}

executable_semantics/testdata/return/fail_implicit_with_explicit_return.carbon

@@ -1,21 +0,0 @@
-// 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
-//
-// RUN: %{not} %{executable_semantics} %s 2>&1 | \
-// RUN:   %{FileCheck} --match-full-lines --allow-unused-prefixes=false %s
-// RUN: %{not} %{executable_semantics} --parser_debug --trace_file=- %s 2>&1 | \
-// RUN:   %{FileCheck} --match-full-lines --allow-unused-prefixes %s
-// AUTOUPDATE: %{executable_semantics} %s
-// CHECK: COMPILATION ERROR: {{.*}}/executable_semantics/testdata/return/fail_implicit_with_explicit_return.carbon:15: return (); should not provide a return value, to match the function's signature.
-
-package ExecutableSemanticsTest api;
-
-fn F() {
-  return ();
-}
-
-fn Main() -> i32 {
-  F();
-  return 0;
-}

executable_semantics/testdata/string/fail_hex_lower.carbon

@@ -1,17 +0,0 @@
-// 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
-//
-// RUN: %{not} %{executable_semantics} %s 2>&1 | \
-// RUN:   %{FileCheck} --match-full-lines --allow-unused-prefixes=false %s
-// RUN: %{not} %{executable_semantics} --parser_debug --trace_file=- %s 2>&1 | \
-// RUN:   %{FileCheck} --match-full-lines --allow-unused-prefixes %s
-// AUTOUPDATE: %{executable_semantics} %s
-// CHECK: COMPILATION ERROR: {{.*}}/executable_semantics/testdata/string/fail_hex_lower.carbon:15: Invalid escaping in string: "str\xaa"
-
-package ExecutableSemanticsTest api;
-
-fn Main() -> i32 {
-  Print("str\xaa");
-  return 0;
-}

executable_semantics/testdata/string/fail_hex_truncated.carbon

@@ -1,17 +0,0 @@
-// 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
-//
-// RUN: %{not} %{executable_semantics} %s 2>&1 | \
-// RUN:   %{FileCheck} --match-full-lines --allow-unused-prefixes=false %s
-// RUN: %{not} %{executable_semantics} --parser_debug --trace_file=- %s 2>&1 | \
-// RUN:   %{FileCheck} --match-full-lines --allow-unused-prefixes %s
-// AUTOUPDATE: %{executable_semantics} %s
-// CHECK: COMPILATION ERROR: {{.*}}/executable_semantics/testdata/string/fail_hex_truncated.carbon:15: Invalid escaping in string: "str\x"
-
-package ExecutableSemanticsTest api;
-
-fn Main() -> i32 {
-  Print("str\x");
-  return 0;
-}

executable_semantics/testdata/string/fail_invalid_escape.carbon

@@ -1,17 +0,0 @@
-// 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
-//
-// RUN: %{not} %{executable_semantics} %s 2>&1 | \
-// RUN:   %{FileCheck} --match-full-lines --allow-unused-prefixes=false %s
-// RUN: %{not} %{executable_semantics} --parser_debug --trace_file=- %s 2>&1 | \
-// RUN:   %{FileCheck} --match-full-lines --allow-unused-prefixes %s
-// AUTOUPDATE: %{executable_semantics} %s
-// CHECK: COMPILATION ERROR: {{.*}}/executable_semantics/testdata/string/fail_invalid_escape.carbon:15: Invalid escaping in string: "str\e"
-
-package ExecutableSemanticsTest api;
-
-fn Main() -> i32 {
-  Print("str\e");
-  return 0;
-}

executable_semantics/testdata/string/fail_newline.carbon

@@ -1,18 +0,0 @@
-// 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
-//
-// RUN: %{not} %{executable_semantics} %s 2>&1 | \
-// RUN:   %{FileCheck} --match-full-lines --allow-unused-prefixes=false %s
-// RUN: %{not} %{executable_semantics} --parser_debug --trace_file=- %s 2>&1 | \
-// RUN:   %{FileCheck} --match-full-lines --allow-unused-prefixes %s
-// AUTOUPDATE: %{executable_semantics} %s
-// CHECK: COMPILATION ERROR: {{.*}}/executable_semantics/testdata/string/fail_newline.carbon:15: invalid character '\x22' in source file.
-
-package ExecutableSemanticsTest api;
-
-fn Main() -> i32 {
-  Print("new
-line");
-  return 0;
-}

executable_semantics/testdata/string/fail_octal.carbon

@@ -1,17 +0,0 @@
-// 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
-//
-// RUN: %{not} %{executable_semantics} %s 2>&1 | \
-// RUN:   %{FileCheck} --match-full-lines --allow-unused-prefixes=false %s
-// RUN: %{not} %{executable_semantics} --parser_debug --trace_file=- %s 2>&1 | \
-// RUN:   %{FileCheck} --match-full-lines --allow-unused-prefixes %s
-// AUTOUPDATE: %{executable_semantics} %s
-// CHECK: COMPILATION ERROR: {{.*}}/executable_semantics/testdata/string/fail_octal.carbon:15: Invalid escaping in string: "str\01"
-
-package ExecutableSemanticsTest api;
-
-fn Main() -> i32 {
-  Print("str\01");
-  return 0;
-}

executable_semantics/testdata/string/fail_tab.carbon

@@ -1,17 +0,0 @@
-// 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
-//
-// RUN: %{not} %{executable_semantics} %s 2>&1 | \
-// RUN:   %{FileCheck} --match-full-lines --allow-unused-prefixes=false %s
-// RUN: %{not} %{executable_semantics} --parser_debug --trace_file=- %s 2>&1 | \
-// RUN:   %{FileCheck} --match-full-lines --allow-unused-prefixes %s
-// AUTOUPDATE: %{executable_semantics} %s
-// CHECK: COMPILATION ERROR: {{.*}}/executable_semantics/testdata/string/fail_tab.carbon:15: Invalid escaping in string: "new	line"
-
-package ExecutableSemanticsTest api;
-
-fn Main() -> i32 {
-  Print("new	line");
-  return 0;
-}

executable_semantics/BUILD → explorer/BUILD

@@ -6,7 +6,7 @@ load("@mypy_integration//:mypy.bzl", "mypy_test")
 
 package(default_visibility = [
     "//bazel/check_deps:__pkg__",
-    "//executable_semantics:__subpackages__",
+    "//explorer:__subpackages__",
     "//installers:__subpackages__",
 ])
 
@@ -21,17 +21,17 @@ cc_library(
     hdrs = ["main.h"],
     deps = [
         "//common:error",
-        "//executable_semantics/common:arena",
-        "//executable_semantics/common:nonnull",
-        "//executable_semantics/interpreter:exec_program",
-        "//executable_semantics/syntax",
-        "//executable_semantics/syntax:prelude",
+        "//explorer/common:arena",
+        "//explorer/common:nonnull",
+        "//explorer/interpreter:exec_program",
+        "//explorer/syntax",
+        "//explorer/syntax:prelude",
         "@llvm-project//llvm:Support",
     ],
 )
 
 cc_binary(
-    name = "executable_semantics",
+    name = "explorer",
     srcs = ["main_bin.cpp"],
     deps = [
         ":main",

executable_semantics/README.md → explorer/README.md

@@ -1,4 +1,4 @@
-# Executable Semantics
+# Explorer
 
 <!--
 Part of the Carbon Language project, under the Apache License v2.0 with LLVM
@@ -6,56 +6,55 @@ Exceptions. See /LICENSE for license information.
 SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 -->
 
-`executable_semantics` is an implementation of Carbon whose primary purpose is
-to act as a clear specification of the language. As an extension of that goal,
-it can also be used as a platform for prototyping and validating changes to the
-language. Consequently, it prioritizes straightforward, readable code over
-performance, diagnostic quality, and other conventional implementation
-priorities. In other words, its intended audience is people working on the
-design of Carbon, and it is not intended for real-world Carbon programming on
-any scale. See the [`toolchain`](/toolchain/) directory for a separate
-implementation that's focused on the needs of Carbon users.
+`explorer` is an implementation of Carbon whose primary purpose is to act as a
+clear specification of the language. As an extension of that goal, it can also
+be used as a platform for prototyping and validating changes to the language.
+Consequently, it prioritizes straightforward, readable code over performance,
+diagnostic quality, and other conventional implementation priorities. In other
+words, its intended audience is people working on the design of Carbon, and it
+is not intended for real-world Carbon programming on any scale. See the
+[`toolchain`](/toolchain/) directory for a separate implementation that's
+focused on the needs of Carbon users.
 
 ## Overview
 
-`executable_semantics` represents Carbon code using an abstract syntax tree
-(AST), which is defined in the [`ast`](ast/) directory. The [`syntax`](syntax/)
-directory contains lexer and parser, which define how the AST is generated from
-Carbon code. The [`interpreter`](interpreter/) directory contains the remainder
-of the implementation.
+`explorer` represents Carbon code using an abstract syntax tree (AST), which is
+defined in the [`ast`](ast/) directory. The [`syntax`](syntax/) directory
+contains lexer and parser, which define how the AST is generated from Carbon
+code. The [`interpreter`](interpreter/) directory contains the remainder of the
+implementation.
 
-`executable_semantics` is an interpreter rather than a compiler, although it
-attempts to separate compile time from run time, since that separation is an
-important constraint on Carbon's design.
+`explorer` is an interpreter rather than a compiler, although it attempts to
+separate compile time from run time, since that separation is an important
+constraint on Carbon's design.
 
 ## Programming conventions
 
-The class hierarchies in `executable_semantics` are built to support
+The class hierarchies in `explorer` are built to support
 [LLVM-style RTTI](https://llvm.org/docs/HowToSetUpLLVMStyleRTTI.html), and
 define a `kind` accessor that returns an enum identifying the concrete type.
-`executable_semantics` typically relies less on virtual dispatch, and more on
-using `kind` as the key of a `switch` and then down-casting in the individual
-cases. As a result, adding a new derived class to a hierarchy requires updating
-existing code to handle it. It is generally better to avoid defining `default`
-cases for RTTI switches, so that the compiler can help ensure the code is
-updated when a new type is added.
-
-`executable_semantics` never uses plain pointer types directly. Instead, we use
-the [`Nonnull<T*>`](common/nonnull.h) alias for pointers that are not nullable,
-or `std::optional<Nonnull<T*>>` for pointers that are nullable.
-
-Many of the most commonly-used objects in `executable_semantics` have lifetimes
-that are tied to the lifespan of the entire Carbon program. We manage the
-lifetimes of those objects by allocating them through an
-[`Arena`](common/arena.h) object, which can allocate objects of arbitrary types,
-and retains ownership of them. As of this writing, all of `executable_semantics`
-uses a single `Arena` object, we may introduce multiple `Arena`s for different
-lifetime groups in the future.
-
-For simplicity, `executable_semantics` generally treats all errors as fatal.
-Errors caused by bugs in the user-provided Carbon code should be reported with
-the error builders in [`error_builders.h`](common/error_builders.h). Errors
-caused by bugs in `executable_semantics` itself should be reported with
+`explorer` typically relies less on virtual dispatch, and more on using `kind`
+as the key of a `switch` and then down-casting in the individual cases. As a
+result, adding a new derived class to a hierarchy requires updating existing
+code to handle it. It is generally better to avoid defining `default` cases for
+RTTI switches, so that the compiler can help ensure the code is updated when a
+new type is added.
+
+`explorer` never uses plain pointer types directly. Instead, we use the
+[`Nonnull<T*>`](common/nonnull.h) alias for pointers that are not nullable, or
+`std::optional<Nonnull<T*>>` for pointers that are nullable.
+
+Many of the most commonly-used objects in `explorer` have lifetimes that are
+tied to the lifespan of the entire Carbon program. We manage the lifetimes of
+those objects by allocating them through an [`Arena`](common/arena.h) object,
+which can allocate objects of arbitrary types, and retains ownership of them. As
+of this writing, all of `explorer` uses a single `Arena` object, we may
+introduce multiple `Arena`s for different lifetime groups in the future.
+
+For simplicity, `explorer` generally treats all errors as fatal. Errors caused
+by bugs in the user-provided Carbon code should be reported with the error
+builders in [`error_builders.h`](common/error_builders.h). Errors caused by bugs
+in `explorer` itself should be reported with
 [`CHECK` or `FATAL`](../common/check.h).
 
 ## Example Programs (Regression Tests)
@@ -73,14 +72,14 @@ boilerplate at the top:
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
-// RUN: executable_semantics %s 2>&1 | \
+// RUN: explorer %s 2>&1 | \
 // RUN:   FileCheck --match-full-lines --allow-unused-prefixes=false %s
-// RUN: executable_semantics --trace %s 2>&1 | \
+// RUN: explorer --trace %s 2>&1 | \
 // RUN:   FileCheck --match-full-lines --allow-unused-prefixes %s
-// AUTOUPDATE: executable_semantics %s
+// AUTOUPDATE: explorer %s
 // CHECK: result: 0
 
-package ExecutableSemanticsTest api;
+package ExplorerTest api;
 ```
 
 To explain this boilerplate:
@@ -97,7 +96,7 @@ To explain this boilerplate:
         line must match a complete output line, with no extra characters before
         or after the `CHECK` pattern.
     -   `RUN:` will be followed by the `not` command when failure is expected.
-        In particular, `RUN: not executable_semantics ...`.
+        In particular, `RUN: not explorer ...`.
     -   `%s` is a
         [`lit` substitution](https://llvm.org/docs/CommandGuide/lit.html#substitutions)
         for the path to the given test file.

executable_semantics/ast/BUILD → explorer/ast/BUILD

@@ -2,7 +2,7 @@
 # Exceptions. See /LICENSE for license information.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-package(default_visibility = ["//executable_semantics:__subpackages__"])
+package(default_visibility = ["//explorer:__subpackages__"])
 
 cc_library(
     name = "ast",
@@ -10,7 +10,7 @@ cc_library(
     deps = [
         ":declaration",
         ":library_name",
-        "//executable_semantics/common:nonnull",
+        "//explorer/common:nonnull",
     ],
 )
 
@@ -22,7 +22,7 @@ cc_library(
         "ast_rtti.h",
     ],
     deps = [
-        "//executable_semantics/common:source_location",
+        "//explorer/common:source_location",
         "@llvm-project//llvm:Support",
     ],
 )
@@ -31,9 +31,9 @@ genrule(
     name = "ast_rtti",
     srcs = ["ast_rtti.txt"],
     outs = ["ast_rtti.h"],
-    cmd = "./$(location //executable_semantics:gen_rtti)" +
+    cmd = "./$(location //explorer:gen_rtti)" +
           " $(location ast_rtti.txt) > \"$@\"",
-    tools = ["//executable_semantics:gen_rtti"],
+    tools = ["//explorer:gen_rtti"],
 )
 
 cc_library(
@@ -65,7 +65,7 @@ cc_test(
         ":pattern",
         ":statement",
         "//common:gtest_main",
-        "//executable_semantics/common:arena",
+        "//explorer/common:arena",
         "@com_google_googletest//:gtest",
     ],
 )
@@ -81,8 +81,8 @@ cc_library(
         ":value_category",
         "//common:check",
         "//common:ostream",
-        "//executable_semantics/common:nonnull",
-        "//executable_semantics/common:source_location",
+        "//explorer/common:nonnull",
+        "//explorer/common:source_location",
         "@llvm-project//llvm:Support",
     ],
 )
@@ -102,8 +102,8 @@ cc_library(
         ":static_scope",
         ":value_category",
         "//common:ostream",
-        "//executable_semantics/common:nonnull",
-        "//executable_semantics/common:source_location",
+        "//explorer/common:nonnull",
+        "//explorer/common:source_location",
         "@llvm-project//llvm:Support",
     ],
 )
@@ -115,8 +115,8 @@ cc_library(
         ":expression",
         "//common:check",
         "//common:ostream",
-        "//executable_semantics/common:nonnull",
-        "//executable_semantics/common:source_location",
+        "//explorer/common:nonnull",
+        "//explorer/common:source_location",
         "@llvm-project//llvm:Support",
     ],
 )
@@ -132,9 +132,9 @@ cc_library(
         ":value_category",
         "//common:indirect_value",
         "//common:ostream",
-        "//executable_semantics/common:arena",
-        "//executable_semantics/common:error_builders",
-        "//executable_semantics/common:source_location",
+        "//explorer/common:arena",
+        "//explorer/common:error_builders",
+        "//explorer/common:source_location",
         "@llvm-project//llvm:Support",
     ],
 )
@@ -146,7 +146,7 @@ cc_test(
         ":expression",
         ":paren_contents",
         "//common:gtest_main",
-        "//executable_semantics/common:arena",
+        "//explorer/common:arena",
         "@com_google_googletest//:gtest",
         "@llvm-project//llvm:Support",
     ],
@@ -161,8 +161,8 @@ cc_library(
     name = "paren_contents",
     hdrs = ["paren_contents.h"],
     deps = [
-        "//executable_semantics/common:error_builders",
-        "//executable_semantics/common:source_location",
+        "//explorer/common:error_builders",
+        "//explorer/common:source_location",
     ],
 )
 
@@ -176,9 +176,9 @@ cc_library(
         ":static_scope",
         ":value_category",
         "//common:ostream",
-        "//executable_semantics/common:arena",
-        "//executable_semantics/common:error_builders",
-        "//executable_semantics/common:source_location",
+        "//explorer/common:arena",
+        "//explorer/common:error_builders",
+        "//explorer/common:source_location",
         "@llvm-project//llvm:Support",
     ],
 )
@@ -191,7 +191,7 @@ cc_test(
         ":paren_contents",
         ":pattern",
         "//common:gtest_main",
-        "//executable_semantics/common:arena",
+        "//explorer/common:arena",
         "@com_google_googletest//:gtest",
         "@llvm-project//llvm:Support",
     ],
@@ -206,9 +206,9 @@ cc_library(
         ":value_category",
         "//common:check",
         "//common:error",
-        "//executable_semantics/common:error_builders",
-        "//executable_semantics/common:nonnull",
-        "//executable_semantics/common:source_location",
+        "//explorer/common:error_builders",
+        "//explorer/common:nonnull",
+        "//explorer/common:source_location",
         "@llvm-project//llvm:Support",
     ],
 )
@@ -226,8 +226,8 @@ cc_library(
         ":value_category",
         "//common:check",
         "//common:ostream",
-        "//executable_semantics/common:arena",
-        "//executable_semantics/common:source_location",
+        "//explorer/common:arena",
+        "//explorer/common:source_location",
         "@llvm-project//llvm:Support",
     ],
 )

executable_semantics/ast/README.md → explorer/ast/README.md

@@ -5,7 +5,7 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 -->
 
 The code in this directory defines the AST that represents Carbon code in the
-rest of `executable-semantics`.
+rest of `explorer`.
 
 The AST is not quite immutable, because some node properties are set during some
 phase of static analysis, rather than during parsing. However, AST mutations are

executable_semantics/ast/ast.h → explorer/ast/ast.h

@@ -2,14 +2,14 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef EXECUTABLE_SEMANTICS_AST_AST_H_
-#define EXECUTABLE_SEMANTICS_AST_AST_H_
+#ifndef EXPLORER_AST_AST_H_
+#define EXPLORER_AST_AST_H_
 
 #include <vector>
 
-#include "executable_semantics/ast/declaration.h"
-#include "executable_semantics/ast/library_name.h"
-#include "executable_semantics/common/nonnull.h"
+#include "explorer/ast/declaration.h"
+#include "explorer/ast/library_name.h"
+#include "explorer/common/nonnull.h"
 
 namespace Carbon {
 
@@ -29,4 +29,4 @@ struct AST {
 
 }  // namespace Carbon
 
-#endif  // EXECUTABLE_SEMANTICS_AST_AST_H_
+#endif  // EXPLORER_AST_AST_H_

executable_semantics/ast/ast_node.cpp → explorer/ast/ast_node.cpp

@@ -2,7 +2,7 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "executable_semantics/ast/ast_node.h"
+#include "explorer/ast/ast_node.h"
 
 namespace Carbon {
 

executable_semantics/ast/ast_node.h → explorer/ast/ast_node.h

@@ -2,11 +2,11 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef EXECUTABLE_SEMANTICS_AST_AST_NODE_H_
-#define EXECUTABLE_SEMANTICS_AST_AST_NODE_H_
+#ifndef EXPLORER_AST_AST_NODE_H_
+#define EXPLORER_AST_AST_NODE_H_
 
-#include "executable_semantics/ast/ast_rtti.h"
-#include "executable_semantics/common/source_location.h"
+#include "explorer/ast/ast_rtti.h"
+#include "explorer/common/source_location.h"
 #include "llvm/Support/Casting.h"
 
 namespace Carbon {
@@ -76,4 +76,4 @@ class AstNode {
 
 }  // namespace Carbon
 
-#endif  // EXECUTABLE_SEMANTICS_AST_AST_NODE_H_
+#endif  // EXPLORER_AST_AST_NODE_H_

executable_semantics/ast/ast_test_matchers.h → explorer/ast/ast_test_matchers.h

@@ -9,17 +9,17 @@
 // TODO: Provide matchers for all node Kinds, and establish more uniform
 // conventions for them.
 
-#ifndef EXECUTABLE_SEMANTICS_AST_AST_TEST_MATCHERS_H_
-#define EXECUTABLE_SEMANTICS_AST_AST_TEST_MATCHERS_H_
+#ifndef EXPLORER_AST_AST_TEST_MATCHERS_H_
+#define EXPLORER_AST_AST_TEST_MATCHERS_H_
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
 #include <ostream>
 
-#include "executable_semantics/ast/ast_node.h"
-#include "executable_semantics/ast/ast_test_matchers_internal.h"
-#include "executable_semantics/ast/expression.h"
+#include "explorer/ast/ast_node.h"
+#include "explorer/ast/ast_test_matchers_internal.h"
+#include "explorer/ast/expression.h"
 
 namespace Carbon {
 
@@ -129,4 +129,4 @@ inline auto ASTDeclarations(
 
 }  // namespace Carbon
 
-#endif  // EXECUTABLE_SEMANTICS_AST_AST_TEST_MATCHERS_H_
+#endif  // EXPLORER_AST_AST_TEST_MATCHERS_H_

executable_semantics/ast/ast_test_matchers_internal.cpp → explorer/ast/ast_test_matchers_internal.cpp

@@ -2,7 +2,7 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "executable_semantics/ast/ast_test_matchers_internal.h"
+#include "explorer/ast/ast_test_matchers_internal.h"
 
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/Support/raw_ostream.h"

executable_semantics/ast/ast_test_matchers_internal.h → explorer/ast/ast_test_matchers_internal.h

@@ -4,19 +4,19 @@
 
 // Implementation details of the functions in ast_test_matchers.h.
 
-#ifndef EXECUTABLE_SEMANTICS_AST_AST_TEST_MATCHERS_INTERNAL_H_
-#define EXECUTABLE_SEMANTICS_AST_AST_TEST_MATCHERS_INTERNAL_H_
+#ifndef EXPLORER_AST_AST_TEST_MATCHERS_INTERNAL_H_
+#define EXPLORER_AST_AST_TEST_MATCHERS_INTERNAL_H_
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
 #include <ostream>
 
-#include "executable_semantics/ast/ast.h"
-#include "executable_semantics/ast/ast_node.h"
-#include "executable_semantics/ast/declaration.h"
-#include "executable_semantics/ast/expression.h"
-#include "executable_semantics/ast/statement.h"
+#include "explorer/ast/ast.h"
+#include "explorer/ast/ast_node.h"
+#include "explorer/ast/declaration.h"
+#include "explorer/ast/expression.h"
+#include "explorer/ast/statement.h"
 #include "llvm/Support/Casting.h"
 
 namespace Carbon::TestingInternal {
@@ -234,4 +234,4 @@ class ASTDeclarationsMatcher {
 
 }  // namespace Carbon::TestingInternal
 
-#endif  // EXECUTABLE_SEMANTICS_AST_AST_TEST_MATCHERS_INTERNAL_H_
+#endif  // EXPLORER_AST_AST_TEST_MATCHERS_INTERNAL_H_

executable_semantics/ast/ast_test_matchers_test.cpp → explorer/ast/ast_test_matchers_test.cpp

@@ -2,16 +2,16 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "executable_semantics/ast/ast_test_matchers.h"
+#include "explorer/ast/ast_test_matchers.h"
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "executable_semantics/ast/declaration.h"
-#include "executable_semantics/ast/expression.h"
-#include "executable_semantics/ast/pattern.h"
-#include "executable_semantics/ast/statement.h"
-#include "executable_semantics/common/arena.h"
+#include "explorer/ast/declaration.h"
+#include "explorer/ast/expression.h"
+#include "explorer/ast/pattern.h"
+#include "explorer/ast/statement.h"
+#include "explorer/common/arena.h"
 
 namespace Carbon::Testing {
 namespace {

executable_semantics/ast/declaration.cpp → explorer/ast/declaration.cpp

@@ -2,7 +2,7 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "executable_semantics/ast/declaration.h"
+#include "explorer/ast/declaration.h"
 
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/Support/Casting.h"

executable_semantics/ast/declaration.h → explorer/ast/declaration.h

@@ -2,23 +2,23 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef EXECUTABLE_SEMANTICS_AST_DECLARATION_H_
-#define EXECUTABLE_SEMANTICS_AST_DECLARATION_H_
+#ifndef EXPLORER_AST_DECLARATION_H_
+#define EXPLORER_AST_DECLARATION_H_
 
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "common/ostream.h"
-#include "executable_semantics/ast/ast_node.h"
-#include "executable_semantics/ast/impl_binding.h"
-#include "executable_semantics/ast/pattern.h"
-#include "executable_semantics/ast/return_term.h"
-#include "executable_semantics/ast/statement.h"
-#include "executable_semantics/ast/static_scope.h"
-#include "executable_semantics/ast/value_category.h"
-#include "executable_semantics/common/nonnull.h"
-#include "executable_semantics/common/source_location.h"
+#include "explorer/ast/ast_node.h"
+#include "explorer/ast/impl_binding.h"
+#include "explorer/ast/pattern.h"
+#include "explorer/ast/return_term.h"
+#include "explorer/ast/statement.h"
+#include "explorer/ast/static_scope.h"
+#include "explorer/ast/value_category.h"
+#include "explorer/common/nonnull.h"
+#include "explorer/common/source_location.h"
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/Support/Compiler.h"
 
@@ -397,4 +397,4 @@ auto GetName(const Declaration&) -> std::optional<std::string>;
 
 }  // namespace Carbon
 
-#endif  // EXECUTABLE_SEMANTICS_AST_DECLARATION_H_
+#endif  // EXPLORER_AST_DECLARATION_H_

executable_semantics/ast/expression.cpp → explorer/ast/expression.cpp

@@ -2,13 +2,13 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "executable_semantics/ast/expression.h"
+#include "explorer/ast/expression.h"
 
 #include <map>
 #include <optional>
 
-#include "executable_semantics/common/arena.h"
-#include "executable_semantics/common/error_builders.h"
+#include "explorer/common/arena.h"
+#include "explorer/common/error_builders.h"
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/Support/Casting.h"
 #include "llvm/Support/raw_ostream.h"

executable_semantics/ast/expression.h → explorer/ast/expression.h

@@ -2,8 +2,8 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef EXECUTABLE_SEMANTICS_AST_EXPRESSION_H_
-#define EXECUTABLE_SEMANTICS_AST_EXPRESSION_H_
+#ifndef EXPLORER_AST_EXPRESSION_H_
+#define EXPLORER_AST_EXPRESSION_H_
 
 #include <map>
 #include <optional>
@@ -12,12 +12,12 @@
 #include <vector>
 
 #include "common/ostream.h"
-#include "executable_semantics/ast/ast_node.h"
-#include "executable_semantics/ast/paren_contents.h"
-#include "executable_semantics/ast/static_scope.h"
-#include "executable_semantics/ast/value_category.h"
-#include "executable_semantics/common/arena.h"
-#include "executable_semantics/common/source_location.h"
+#include "explorer/ast/ast_node.h"
+#include "explorer/ast/paren_contents.h"
+#include "explorer/ast/static_scope.h"
+#include "explorer/ast/value_category.h"
+#include "explorer/common/arena.h"
+#include "explorer/common/source_location.h"
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/Support/Compiler.h"
 
@@ -652,4 +652,4 @@ auto TupleExpressionFromParenContents(
 
 }  // namespace Carbon
 
-#endif  // EXECUTABLE_SEMANTICS_AST_EXPRESSION_H_
+#endif  // EXPLORER_AST_EXPRESSION_H_

executable_semantics/ast/expression_test.cpp → explorer/ast/expression_test.cpp

@@ -2,15 +2,15 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "executable_semantics/ast/expression.h"
+#include "explorer/ast/expression.h"
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
 #include <string>
 
-#include "executable_semantics/ast/paren_contents.h"
-#include "executable_semantics/common/arena.h"
+#include "explorer/ast/paren_contents.h"
+#include "explorer/common/arena.h"
 #include "llvm/Support/Casting.h"
 
 namespace Carbon::Testing {

executable_semantics/ast/impl_binding.h → explorer/ast/impl_binding.h

@@ -2,16 +2,16 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef EXECUTABLE_SEMANTICS_AST_GENERIC_BINDING_H_
-#define EXECUTABLE_SEMANTICS_AST_GENERIC_BINDING_H_
+#ifndef EXPLORER_AST_GENERIC_BINDING_H_
+#define EXPLORER_AST_GENERIC_BINDING_H_
 
 #include <map>
 
 #include "common/check.h"
 #include "common/ostream.h"
-#include "executable_semantics/ast/ast_node.h"
-#include "executable_semantics/ast/pattern.h"
-#include "executable_semantics/ast/value_category.h"
+#include "explorer/ast/ast_node.h"
+#include "explorer/ast/pattern.h"
+#include "explorer/ast/value_category.h"
 
 namespace Carbon {
 
@@ -75,4 +75,4 @@ class ImplBinding : public AstNode {
 
 }  // namespace Carbon
 
-#endif  // EXECUTABLE_SEMANTICS_AST_GENERIC_BINDING_H_
+#endif  // EXPLORER_AST_GENERIC_BINDING_H_

executable_semantics/ast/library_name.h → explorer/ast/library_name.h

@@ -2,8 +2,8 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef EXECUTABLE_SEMANTICS_AST_LIBRARY_NAME_H_
-#define EXECUTABLE_SEMANTICS_AST_LIBRARY_NAME_H_
+#ifndef EXPLORER_AST_LIBRARY_NAME_H_
+#define EXPLORER_AST_LIBRARY_NAME_H_
 
 #include <string>
 
@@ -22,4 +22,4 @@ struct LibraryName {
 
 }  // namespace Carbon
 
-#endif  // EXECUTABLE_SEMANTICS_AST_LIBRARY_NAME_H_
+#endif  // EXPLORER_AST_LIBRARY_NAME_H_

executable_semantics/ast/paren_contents.h → explorer/ast/paren_contents.h

@@ -2,15 +2,15 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef EXECUTABLE_SEMANTICS_AST_PAREN_CONTENTS_H_
-#define EXECUTABLE_SEMANTICS_AST_PAREN_CONTENTS_H_
+#ifndef EXPLORER_AST_PAREN_CONTENTS_H_
+#define EXPLORER_AST_PAREN_CONTENTS_H_
 
 #include <optional>
 #include <string>
 #include <vector>
 
-#include "executable_semantics/common/error_builders.h"
-#include "executable_semantics/common/source_location.h"
+#include "explorer/common/error_builders.h"
+#include "explorer/common/source_location.h"
 
 namespace Carbon {
 
@@ -48,4 +48,4 @@ auto ParenContents<Term>::SingleTerm() const -> std::optional<Nonnull<Term*>> {
 
 }  // namespace Carbon
 
-#endif  // EXECUTABLE_SEMANTICS_AST_PAREN_CONTENTS_H_
+#endif  // EXPLORER_AST_PAREN_CONTENTS_H_

executable_semantics/ast/pattern.cpp → explorer/ast/pattern.cpp

@@ -2,14 +2,14 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "executable_semantics/ast/pattern.h"
+#include "explorer/ast/pattern.h"
 
 #include <string>
 
 #include "common/ostream.h"
-#include "executable_semantics/ast/expression.h"
-#include "executable_semantics/common/arena.h"
-#include "executable_semantics/common/error_builders.h"
+#include "explorer/ast/expression.h"
+#include "explorer/common/arena.h"
+#include "explorer/common/error_builders.h"
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/Support/Casting.h"
 

executable_semantics/ast/pattern.h → explorer/ast/pattern.h

@@ -2,20 +2,20 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef EXECUTABLE_SEMANTICS_AST_PATTERN_H_
-#define EXECUTABLE_SEMANTICS_AST_PATTERN_H_
+#ifndef EXPLORER_AST_PATTERN_H_
+#define EXPLORER_AST_PATTERN_H_
 
 #include <optional>
 #include <string>
 #include <vector>
 
 #include "common/ostream.h"
-#include "executable_semantics/ast/ast_node.h"
-#include "executable_semantics/ast/ast_rtti.h"
-#include "executable_semantics/ast/expression.h"
-#include "executable_semantics/ast/static_scope.h"
-#include "executable_semantics/ast/value_category.h"
-#include "executable_semantics/common/source_location.h"
+#include "explorer/ast/ast_node.h"
+#include "explorer/ast/ast_rtti.h"
+#include "explorer/ast/expression.h"
+#include "explorer/ast/static_scope.h"
+#include "explorer/ast/value_category.h"
+#include "explorer/common/source_location.h"
 #include "llvm/ADT/ArrayRef.h"
 
 namespace Carbon {
@@ -344,4 +344,4 @@ class ExpressionPattern : public Pattern {
 
 }  // namespace Carbon
 
-#endif  // EXECUTABLE_SEMANTICS_AST_PATTERN_H_
+#endif  // EXPLORER_AST_PATTERN_H_

executable_semantics/ast/pattern_test.cpp → explorer/ast/pattern_test.cpp

@@ -2,14 +2,14 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "executable_semantics/ast/pattern.h"
+#include "explorer/ast/pattern.h"
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "executable_semantics/ast/expression.h"
-#include "executable_semantics/ast/paren_contents.h"
-#include "executable_semantics/common/arena.h"
+#include "explorer/ast/expression.h"
+#include "explorer/ast/paren_contents.h"
+#include "explorer/common/arena.h"
 #include "llvm/Support/Casting.h"
 
 namespace Carbon::Testing {

executable_semantics/ast/return_term.h → explorer/ast/return_term.h

@@ -2,17 +2,17 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef EXECUTABLE_SEMANTICS_AST_RETURN_TERM_H_
-#define EXECUTABLE_SEMANTICS_AST_RETURN_TERM_H_
+#ifndef EXPLORER_AST_RETURN_TERM_H_
+#define EXPLORER_AST_RETURN_TERM_H_
 
 #include <optional>
 #include <utility>
 
 #include "common/check.h"
 #include "common/ostream.h"
-#include "executable_semantics/ast/expression.h"
-#include "executable_semantics/common/nonnull.h"
-#include "executable_semantics/common/source_location.h"
+#include "explorer/ast/expression.h"
+#include "explorer/common/nonnull.h"
+#include "explorer/common/source_location.h"
 
 namespace Carbon {
 
@@ -97,4 +97,4 @@ class ReturnTerm {
 
 }  // namespace Carbon
 
-#endif  // EXECUTABLE_SEMANTICS_AST_RETURN_TERM_H_
+#endif  // EXPLORER_AST_RETURN_TERM_H_

executable_semantics/ast/statement.cpp → explorer/ast/statement.cpp

@@ -2,10 +2,10 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "executable_semantics/ast/statement.h"
+#include "explorer/ast/statement.h"
 
 #include "common/check.h"
-#include "executable_semantics/common/arena.h"
+#include "explorer/common/arena.h"
 #include "llvm/Support/Casting.h"
 
 namespace Carbon {

executable_semantics/ast/statement.h → explorer/ast/statement.h

@@ -2,21 +2,21 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef EXECUTABLE_SEMANTICS_AST_STATEMENT_H_
-#define EXECUTABLE_SEMANTICS_AST_STATEMENT_H_
+#ifndef EXPLORER_AST_STATEMENT_H_
+#define EXPLORER_AST_STATEMENT_H_
 
 #include <utility>
 #include <vector>
 
 #include "common/ostream.h"
-#include "executable_semantics/ast/ast_node.h"
-#include "executable_semantics/ast/expression.h"
-#include "executable_semantics/ast/pattern.h"
-#include "executable_semantics/ast/return_term.h"
-#include "executable_semantics/ast/static_scope.h"
-#include "executable_semantics/ast/value_category.h"
-#include "executable_semantics/common/arena.h"
-#include "executable_semantics/common/source_location.h"
+#include "explorer/ast/ast_node.h"
+#include "explorer/ast/expression.h"
+#include "explorer/ast/pattern.h"
+#include "explorer/ast/return_term.h"
+#include "explorer/ast/static_scope.h"
+#include "explorer/ast/value_category.h"
+#include "explorer/common/arena.h"
+#include "explorer/common/source_location.h"
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/Support/Compiler.h"
 
@@ -395,4 +395,4 @@ class Await : public Statement {
 
 }  // namespace Carbon
 
-#endif  // EXECUTABLE_SEMANTICS_AST_STATEMENT_H_
+#endif  // EXPLORER_AST_STATEMENT_H_

executable_semantics/ast/static_scope.cpp → explorer/ast/static_scope.cpp

@@ -2,9 +2,9 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "executable_semantics/ast/static_scope.h"
+#include "explorer/ast/static_scope.h"
 
-#include "executable_semantics/common/error_builders.h"
+#include "explorer/common/error_builders.h"
 #include "llvm/Support/Error.h"
 
 namespace Carbon {

executable_semantics/ast/static_scope.h → explorer/ast/static_scope.h

@@ -2,8 +2,8 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef EXECUTABLE_SEMANTICS_AST_STATIC_SCOPE_H_
-#define EXECUTABLE_SEMANTICS_AST_STATIC_SCOPE_H_
+#ifndef EXPLORER_AST_STATIC_SCOPE_H_
+#define EXPLORER_AST_STATIC_SCOPE_H_
 
 #include <functional>
 #include <string>
@@ -13,10 +13,10 @@
 
 #include "common/check.h"
 #include "common/error.h"
-#include "executable_semantics/ast/ast_node.h"
-#include "executable_semantics/ast/value_category.h"
-#include "executable_semantics/common/nonnull.h"
-#include "executable_semantics/common/source_location.h"
+#include "explorer/ast/ast_node.h"
+#include "explorer/ast/value_category.h"
+#include "explorer/common/nonnull.h"
+#include "explorer/common/source_location.h"
 #include "llvm/Support/Error.h"
 
 namespace Carbon {
@@ -183,4 +183,4 @@ class StaticScope {
 
 }  // namespace Carbon
 
-#endif  // EXECUTABLE_SEMANTICS_AST_STATIC_SCOPE_H_
+#endif  // EXPLORER_AST_STATIC_SCOPE_H_

executable_semantics/ast/value_category.h → explorer/ast/value_category.h

@@ -2,8 +2,8 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef EXECUTABLE_SEMANTICS_AST_VALUE_CATEGORY_H_
-#define EXECUTABLE_SEMANTICS_AST_VALUE_CATEGORY_H_
+#ifndef EXPLORER_AST_VALUE_CATEGORY_H_
+#define EXPLORER_AST_VALUE_CATEGORY_H_
 
 namespace Carbon {
 
@@ -19,4 +19,4 @@ enum class ValueCategory {
 
 }  // namespace Carbon
 
-#endif  // EXECUTABLE_SEMANTICS_AST_VALUE_CATEGORY_H_
+#endif  // EXPLORER_AST_VALUE_CATEGORY_H_

executable_semantics/common/BUILD → explorer/common/BUILD

@@ -2,7 +2,7 @@
 # Exceptions. See /LICENSE for license information.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-package(default_visibility = ["//executable_semantics:__subpackages__"])
+package(default_visibility = ["//explorer:__subpackages__"])
 
 cc_library(
     name = "arena",

executable_semantics/common/arena.h → explorer/common/arena.h

@@ -2,14 +2,14 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef EXECUTABLE_SEMANTICS_COMMON_ARENA_H_
-#define EXECUTABLE_SEMANTICS_COMMON_ARENA_H_
+#ifndef EXPLORER_COMMON_ARENA_H_
+#define EXPLORER_COMMON_ARENA_H_
 
 #include <memory>
 #include <type_traits>
 #include <vector>
 
-#include "executable_semantics/common/nonnull.h"
+#include "explorer/common/nonnull.h"
 
 namespace Carbon {
 
@@ -55,4 +55,4 @@ class Arena {
 
 }  // namespace Carbon
 
-#endif  // EXECUTABLE_SEMANTICS_COMMON_ARENA_H_
+#endif  // EXPLORER_COMMON_ARENA_H_

executable_semantics/common/error_builders.h → explorer/common/error_builders.h

@@ -2,11 +2,11 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef EXECUTABLE_SEMANTICS_COMMON_ERROR_BUILDERS_H_
-#define EXECUTABLE_SEMANTICS_COMMON_ERROR_BUILDERS_H_
+#ifndef EXPLORER_COMMON_ERROR_BUILDERS_H_
+#define EXPLORER_COMMON_ERROR_BUILDERS_H_
 
 #include "common/error.h"
-#include "executable_semantics/common/source_location.h"
+#include "explorer/common/source_location.h"
 
 namespace Carbon {
 
@@ -41,4 +41,4 @@ inline auto RuntimeError(SourceLocation loc) -> ErrorBuilder {
 
 }  // namespace Carbon
 
-#endif  // EXECUTABLE_SEMANTICS_COMMON_ERROR_BUILDERS_H_
+#endif  // EXPLORER_COMMON_ERROR_BUILDERS_H_

executable_semantics/common/error_builders_test.cpp → explorer/common/error_builders_test.cpp

@@ -2,11 +2,11 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "executable_semantics/common/error_builders.h"
+#include "explorer/common/error_builders.h"
 
 #include <gtest/gtest.h>
 
-#include "executable_semantics/common/source_location.h"
+#include "explorer/common/source_location.h"
 
 namespace Carbon::Testing {
 namespace {

executable_semantics/common/nonnull.h → explorer/common/nonnull.h

@@ -2,8 +2,8 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef EXECUTABLE_SEMANTICS_COMMON_NONNULL_H_
-#define EXECUTABLE_SEMANTICS_COMMON_NONNULL_H_
+#ifndef EXPLORER_COMMON_NONNULL_H_
+#define EXPLORER_COMMON_NONNULL_H_
 
 #include <type_traits>
 
@@ -19,4 +19,4 @@ using Nonnull = T _Nonnull;
 
 }  // namespace Carbon
 
-#endif  // EXECUTABLE_SEMANTICS_COMMON_NONNULL_H_
+#endif  // EXPLORER_COMMON_NONNULL_H_

executable_semantics/common/source_location.h → explorer/common/source_location.h

@@ -2,14 +2,14 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef EXECUTABLE_SEMANTICS_COMMON_SOURCE_LOCATION_H_
-#define EXECUTABLE_SEMANTICS_COMMON_SOURCE_LOCATION_H_
+#ifndef EXPLORER_COMMON_SOURCE_LOCATION_H_
+#define EXPLORER_COMMON_SOURCE_LOCATION_H_
 
 #include <string>
 #include <string_view>
 
 #include "common/ostream.h"
-#include "executable_semantics/common/nonnull.h"
+#include "explorer/common/nonnull.h"
 
 namespace Carbon {
 
@@ -42,4 +42,4 @@ class SourceLocation {
 
 }  // namespace Carbon
 
-#endif  // EXECUTABLE_SEMANTICS_COMMON_SOURCE_LOCATION_H_
+#endif  // EXPLORER_COMMON_SOURCE_LOCATION_H_

executable_semantics/fuzzing/BUILD → explorer/fuzzing/BUILD

@@ -11,9 +11,9 @@ cc_library(
     hdrs = ["ast_to_proto.h"],
     deps = [
         "//common/fuzzing:carbon_cc_proto",
-        "//executable_semantics/ast",
-        "//executable_semantics/ast:declaration",
-        "//executable_semantics/ast:expression",
+        "//explorer/ast",
+        "//explorer/ast:declaration",
+        "//explorer/ast:expression",
         "@llvm-project//llvm:Support",
     ],
 )
@@ -27,9 +27,9 @@ cc_library(
         "//common:check",
         "//common/fuzzing:carbon_cc_proto",
         "//common/fuzzing:proto_to_carbon_lib",
-        "//executable_semantics/interpreter:exec_program",
-        "//executable_semantics/syntax",
-        "//executable_semantics/syntax:prelude",
+        "//explorer/interpreter:exec_program",
+        "//explorer/syntax",
+        "//explorer/syntax:prelude",
         "@com_google_protobuf//:protobuf_headers",
         "@llvm-project//llvm:Support",
     ],
@@ -39,17 +39,17 @@ cc_test(
     name = "ast_to_proto_test",
     srcs = ["ast_to_proto_test.cpp"],
     args = [
-        "$(locations //executable_semantics:standard_libraries)",
-        "$(locations //executable_semantics/testdata:carbon_files)",
+        "$(locations //explorer:standard_libraries)",
+        "$(locations //explorer/testdata:carbon_files)",
     ],
     data = [
-        "//executable_semantics:standard_libraries",
-        "//executable_semantics/testdata:carbon_files",
+        "//explorer:standard_libraries",
+        "//explorer/testdata:carbon_files",
     ],
     deps = [
         ":ast_to_proto_lib",
         "//common/fuzzing:carbon_cc_proto",
-        "//executable_semantics/syntax",
+        "//explorer/syntax",
         "@com_google_googletest//:gtest",
         "@com_google_protobuf//:protobuf_headers",
         "@llvm-project//llvm:Support",
@@ -65,9 +65,9 @@ cc_binary(
         ":fuzzer_util",
         "//common:error",
         "//common/fuzzing:carbon_cc_proto",
-        "//executable_semantics/common:error_builders",
-        "//executable_semantics/common:nonnull",
-        "//executable_semantics/syntax",
+        "//explorer/common:error_builders",
+        "//explorer/common:nonnull",
+        "//explorer/syntax",
         "@com_google_protobuf//:protobuf_headers",
         "@llvm-project//llvm:Support",
     ],
@@ -99,18 +99,18 @@ cc_test(
     name = "proto_to_carbon_test",
     srcs = ["proto_to_carbon_test.cpp"],
     args = [
-        "$(locations //executable_semantics:standard_libraries)",
-        "$(locations //executable_semantics/testdata:carbon_files)",
+        "$(locations //explorer:standard_libraries)",
+        "$(locations //explorer/testdata:carbon_files)",
     ],
     data = [
-        "//executable_semantics:standard_libraries",
-        "//executable_semantics/testdata:carbon_files",
+        "//explorer:standard_libraries",
+        "//explorer/testdata:carbon_files",
     ],
     deps = [
         ":ast_to_proto_lib",
         "//common/fuzzing:carbon_cc_proto",
         "//common/fuzzing:proto_to_carbon_lib",
-        "//executable_semantics/syntax",
+        "//explorer/syntax",
         "@com_google_googletest//:gtest",
         "@com_google_protobuf//:protobuf_headers",
         "@llvm-project//llvm:Support",
@@ -119,9 +119,9 @@ cc_test(
 
 # Needs `--config=proto-fuzzer` for `bazel build`.
 cc_binary(
-    name = "executable_semantics_fuzzer",
+    name = "explorer_fuzzer",
     testonly = 1,
-    srcs = ["executable_semantics_fuzzer.cpp"],
+    srcs = ["explorer_fuzzer.cpp"],
     features = ["fuzzer"],
     deps = [
         ":fuzzer_util",

executable_semantics/fuzzing/README.md → explorer/fuzzing/README.md

@@ -1,4 +1,4 @@
-# Executable semantics structured fuzzer
+# Explorer structured fuzzer
 
 <!--
 Part of the Carbon Language project, under the Apache License v2.0 with LLVM
@@ -18,22 +18,21 @@ invalid before any interesting parts of the code get a chance to run.
 Structured fuzzing addresses this issue by ensuring the randomly generated data
 is itself structured, and as such has a high chance of presenting a valid input.
 
-`executable_semantics_fuzzer` is a structured fuzzer based on
+`explorer_fuzzer` is a structured fuzzer based on
 [libprotobuf-mutator](https://github.com/google/libprotobuf-mutator), which is a
 library to randomly mutate
 [protobuffers](https://github.com/protocolbuffers/protobuf).
 
 The input to the fuzzer is an instance of `Carbon::Fuzzing::Carbon` proto
-randomly generated by the `libprotobuf-mutator` framework.
-`executable_semantics_fuzzer` converts the proto to a Carbon source code string,
-and tries to parse and execute the code using `executable_semantics`
-implementation.
+randomly generated by the `libprotobuf-mutator` framework. `explorer_fuzzer`
+converts the proto to a Carbon source code string, and tries to parse and
+execute the code using `explorer` implementation.
 
 ## Fuzzer data format
 
 `libprotobuf-mutator` supports fuzzer inputs in either text or binary protocol
-buffer format. `executable_semantics_fuzzer` uses text proto format with
-`Carbon` proto message definition in `common/fuzzing/carbon.proto`.
+buffer format. `explorer_fuzzer` uses text proto format with `Carbon` proto
+message definition in `common/fuzzing/carbon.proto`.
 
 ## Running the fuzzer
 
@@ -45,21 +44,21 @@ a crash is triggered, or forever in a bug-free program ;).
 To run in 'unit test' mode:
 
 ```bash
-bazel test --config=proto-fuzzer --test_output=all //executable_semantics/fuzzing:executable_semantics_fuzzer
+bazel test --config=proto-fuzzer --test_output=all //explorer/fuzzing:explorer_fuzzer
 ```
 
 To run in 'fuzzing' mode:
 
 ```bash
-bazel build --config=proto-fuzzer //executable_semantics/fuzzing:executable_semantics_fuzzer
+bazel build --config=proto-fuzzer //explorer/fuzzing:explorer_fuzzer
 
-bazel-bin/executable_semantics/fuzzing/executable_semantics_fuzzer
+bazel-bin/explorer/fuzzing/explorer_fuzzer
 ```
 
 It's also possible to run the fuzzer on a single input:
 
 ```bash
-bazel-bin/executable_semantics/fuzzing/executable_semantics_fuzzer /tmp/crash.textproto
+bazel-bin/explorer/fuzzing/explorer_fuzzer /tmp/crash.textproto
 ```
 
 ## Investigating a crash
@@ -67,13 +66,13 @@ bazel-bin/executable_semantics/fuzzing/executable_semantics_fuzzer /tmp/crash.te
 To reproduce a crash, run the fuzzer on the crashing input as described above.
 
 A separate tool called `fuzzverter` can be used for things like converting a
-crashing input to Carbon source code for running `executable_semantics` on the
-code directly.
+crashing input to Carbon source code for running `explorer` on the code
+directly.
 
 To convert a `Fuzzing::Carbon` text proto to Carbon source:
 
 ```bash
-bazel-bin/executable_semantics/fuzzing/fuzzverter --mode proto_to_carbon --input /tmp/crash.textproto
+bazel-bin/explorer/fuzzing/fuzzverter --mode proto_to_carbon --input /tmp/crash.textproto
 ```
 
 ## Generating new fuzzer corpus entries
@@ -85,5 +84,5 @@ to be a `Fuzzing::Carbon` text proto.
 To generate a text proto from Carbon source:
 
 ```bash
-bazel-bin/executable_semantics/fuzzing/fuzzverter --mode carbon_to_proto --input /tmp/crash.carbon --output /tmp/crash.textproto
+bazel-bin/explorer/fuzzing/fuzzverter --mode carbon_to_proto --input /tmp/crash.carbon --output /tmp/crash.textproto
 ```

executable_semantics/fuzzing/ast_to_proto.cpp → explorer/fuzzing/ast_to_proto.cpp

@@ -2,12 +2,12 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "executable_semantics/fuzzing/ast_to_proto.h"
+#include "explorer/fuzzing/ast_to_proto.h"
 
 #include <optional>
 
-#include "executable_semantics/ast/declaration.h"
-#include "executable_semantics/ast/expression.h"
+#include "explorer/ast/declaration.h"
+#include "explorer/ast/expression.h"
 #include "llvm/Support/Casting.h"
 
 namespace Carbon {

executable_semantics/fuzzing/ast_to_proto.h → explorer/fuzzing/ast_to_proto.h

@@ -2,11 +2,11 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef EXECUTABLE_SEMANTICS_FUZZING_AST_TO_PROTO_H_
-#define EXECUTABLE_SEMANTICS_FUZZING_AST_TO_PROTO_H_
+#ifndef EXPLORER_FUZZING_AST_TO_PROTO_H_
+#define EXPLORER_FUZZING_AST_TO_PROTO_H_
 
 #include "common/fuzzing/carbon.pb.h"
-#include "executable_semantics/ast/ast.h"
+#include "explorer/ast/ast.h"
 
 namespace Carbon {
 
@@ -15,4 +15,4 @@ auto AstToProto(const AST& ast) -> Fuzzing::CompilationUnit;
 
 }  // namespace Carbon
 
-#endif  // EXECUTABLE_SEMANTICS_FUZZING_AST_TO_PROTO_H_
+#endif  // EXPLORER_FUZZING_AST_TO_PROTO_H_

executable_semantics/fuzzing/ast_to_proto_test.cpp → explorer/fuzzing/ast_to_proto_test.cpp

@@ -2,7 +2,7 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "executable_semantics/fuzzing/ast_to_proto.h"
+#include "explorer/fuzzing/ast_to_proto.h"
 
 #include <gmock/gmock.h>
 #include <google/protobuf/descriptor.h>
@@ -13,7 +13,7 @@
 #include <set>
 #include <variant>
 
-#include "executable_semantics/syntax/parse.h"
+#include "explorer/syntax/parse.h"
 #include "llvm/Support/Error.h"
 
 namespace Carbon::Testing {

executable_semantics/fuzzing/executable_semantics_fuzzer.cpp → explorer/fuzzing/explorer_fuzzer.cpp

@@ -4,7 +4,7 @@
 
 #include <libprotobuf_mutator/src/libfuzzer/libfuzzer_macro.h>
 
-#include "executable_semantics/fuzzing/fuzzer_util.h"
+#include "explorer/fuzzing/fuzzer_util.h"
 
 DEFINE_TEXT_PROTO_FUZZER(const Carbon::Fuzzing::Carbon& input) {
   Carbon::ParseAndExecute(input.compilation_unit());

executable_semantics/fuzzing/fuzzer_util.cpp → explorer/fuzzing/fuzzer_util.cpp

@@ -2,13 +2,13 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "executable_semantics/fuzzing/fuzzer_util.h"
+#include "explorer/fuzzing/fuzzer_util.h"
 
 #include "common/check.h"
 #include "common/fuzzing/proto_to_carbon.h"
-#include "executable_semantics/interpreter/exec_program.h"
-#include "executable_semantics/syntax/parse.h"
-#include "executable_semantics/syntax/prelude.h"
+#include "explorer/interpreter/exec_program.h"
+#include "explorer/syntax/parse.h"
+#include "explorer/syntax/prelude.h"
 #include "llvm/Support/raw_ostream.h"
 
 namespace Carbon {
@@ -43,8 +43,7 @@ void ParseAndExecute(const Fuzzing::CompilationUnit& compilation_unit) {
     llvm::errs() << "Parsing failed: " << ast.error().message() << "\n";
     return;
   }
-  AddPrelude("executable_semantics/data/prelude.carbon", &arena,
-             &ast->declarations);
+  AddPrelude("explorer/data/prelude.carbon", &arena, &ast->declarations);
   const ErrorOr<int> result =
       ExecProgram(&arena, *ast, /*trace_stream=*/std::nullopt);
   if (!result.ok()) {

executable_semantics/fuzzing/fuzzer_util.h → explorer/fuzzing/fuzzer_util.h

@@ -2,8 +2,8 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef EXECUTABLE_SEMANTICS_FUZZING_FUZZER_UTIL_H_
-#define EXECUTABLE_SEMANTICS_FUZZING_FUZZER_UTIL_H_
+#ifndef EXPLORER_FUZZING_FUZZER_UTIL_H_
+#define EXPLORER_FUZZING_FUZZER_UTIL_H_
 
 #include "common/fuzzing/carbon.pb.h"
 
@@ -19,4 +19,4 @@ void ParseAndExecute(const Fuzzing::CompilationUnit& compilation_unit);
 
 }  // namespace Carbon
 
-#endif  // EXECUTABLE_SEMANTICS_FUZZING_FUZZER_UTIL_H_
+#endif  // EXPLORER_FUZZING_FUZZER_UTIL_H_

executable_semantics/fuzzing/fuzzer_util_test.cpp → explorer/fuzzing/fuzzer_util_test.cpp

@@ -2,7 +2,7 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "executable_semantics/fuzzing/fuzzer_util.h"
+#include "explorer/fuzzing/fuzzer_util.h"
 
 #include <gmock/gmock.h>
 #include <google/protobuf/text_format.h>

executable_semantics/fuzzing/fuzzverter.cpp → explorer/fuzzing/fuzzverter.cpp

@@ -19,10 +19,10 @@
 
 #include "common/error.h"
 #include "common/fuzzing/carbon.pb.h"
-#include "executable_semantics/common/error_builders.h"
-#include "executable_semantics/fuzzing/ast_to_proto.h"
-#include "executable_semantics/fuzzing/fuzzer_util.h"
-#include "executable_semantics/syntax/parse.h"
+#include "explorer/common/error_builders.h"
+#include "explorer/fuzzing/ast_to_proto.h"
+#include "explorer/fuzzing/fuzzer_util.h"
+#include "explorer/syntax/parse.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/InitLLVM.h"
 

executable_semantics/fuzzing/proto_to_carbon_test.cpp → explorer/fuzzing/proto_to_carbon_test.cpp

@@ -7,8 +7,8 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "executable_semantics/fuzzing/ast_to_proto.h"
-#include "executable_semantics/syntax/parse.h"
+#include "explorer/fuzzing/ast_to_proto.h"
+#include "explorer/syntax/parse.h"
 
 namespace Carbon::Testing {
 namespace {

executable_semantics/gen_rtti.py → explorer/gen_rtti.py

@@ -220,10 +220,7 @@ def main():
         if node.kind == Class.Kind.ROOT:
             node.Finalize()
 
-    print(
-        f"// Generated from {input_filename} by"
-        + " executable_semantics/gen_rtti.py\n"
-    )
+    print(f"// Generated from {input_filename} by" + " explorer/gen_rtti.py\n")
     guard_macro = (
         input_filename.upper().translate(str.maketrans({"/": "_", ".": "_"}))
         + "_"

executable_semantics/interpreter/BUILD → explorer/interpreter/BUILD

@@ -2,7 +2,7 @@
 # Exceptions. See /LICENSE for license information.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-package(default_visibility = ["//executable_semantics:__pkg__"])
+package(default_visibility = ["//explorer:__pkg__"])
 
 # These currently have to be a single build rule because of a dependency cycle
 # in printing.
@@ -24,13 +24,13 @@ cc_library(
         ":stack",
         "//common:check",
         "//common:ostream",
-        "//executable_semantics/ast:declaration",
-        "//executable_semantics/ast:expression",
-        "//executable_semantics/ast:pattern",
-        "//executable_semantics/ast:statement",
-        "//executable_semantics/common:arena",
-        "//executable_semantics/common:error_builders",
-        "//executable_semantics/common:nonnull",
+        "//explorer/ast:declaration",
+        "//explorer/ast:expression",
+        "//explorer/ast:pattern",
+        "//explorer/ast:statement",
+        "//explorer/common:arena",
+        "//explorer/common:error_builders",
+        "//explorer/common:nonnull",
         "@llvm-project//llvm:Support",
     ],
 )
@@ -43,7 +43,7 @@ cc_library(
         ":action_and_value",
         ":stack",
         "//common:ostream",
-        "//executable_semantics/ast:statement",
+        "//explorer/ast:statement",
         "@llvm-project//llvm:Support",
     ],
 )
@@ -61,7 +61,7 @@ cc_library(
 cc_library(
     name = "dictionary",
     hdrs = ["dictionary.h"],
-    deps = ["//executable_semantics/common:arena"],
+    deps = ["//explorer/common:arena"],
 )
 
 cc_library(
@@ -69,8 +69,8 @@ cc_library(
     srcs = ["exec_program.cpp"],
     hdrs = ["exec_program.h"],
     visibility = [
-        "//executable_semantics:__pkg__",
-        "//executable_semantics/fuzzing:__pkg__",
+        "//explorer:__pkg__",
+        "//explorer/fuzzing:__pkg__",
     ],
     deps = [
         ":interpreter",
@@ -79,8 +79,8 @@ cc_library(
         ":type_checker",
         "//common:check",
         "//common:ostream",
-        "//executable_semantics/ast",
-        "//executable_semantics/common:arena",
+        "//explorer/ast",
+        "//explorer/common:arena",
         "@llvm-project//llvm:Support",
     ],
 )
@@ -90,8 +90,8 @@ cc_library(
     hdrs = ["field_path.h"],
     deps = [
         "//common:ostream",
-        "//executable_semantics/ast",
-        "//executable_semantics/ast:static_scope",
+        "//explorer/ast",
+        "//explorer/ast:static_scope",
         "@llvm-project//llvm:Support",
     ],
 )
@@ -105,9 +105,9 @@ cc_library(
         ":address",
         ":heap_allocation_interface",
         "//common:ostream",
-        "//executable_semantics/common:error_builders",
-        "//executable_semantics/common:nonnull",
-        "//executable_semantics/common:source_location",
+        "//explorer/common:error_builders",
+        "//explorer/common:nonnull",
+        "//explorer/common:source_location",
         "@llvm-project//llvm:Support",
     ],
 )
@@ -117,8 +117,8 @@ cc_library(
     hdrs = ["heap_allocation_interface.h"],
     deps = [
         ":address",
-        "//executable_semantics/common:arena",
-        "//executable_semantics/common:nonnull",
+        "//explorer/common:arena",
+        "//explorer/common:nonnull",
     ],
 )
 
@@ -138,12 +138,12 @@ cc_library(
         ":stack",
         "//common:check",
         "//common:ostream",
-        "//executable_semantics/ast",
-        "//executable_semantics/ast:declaration",
-        "//executable_semantics/ast:expression",
-        "//executable_semantics/ast:pattern",
-        "//executable_semantics/common:arena",
-        "//executable_semantics/common:error_builders",
+        "//explorer/ast",
+        "//explorer/ast:declaration",
+        "//explorer/ast:expression",
+        "//explorer/ast:pattern",
+        "//explorer/common:arena",
+        "//explorer/common:error_builders",
         "@llvm-project//llvm:Support",
     ],
 )
@@ -154,12 +154,12 @@ cc_library(
     hdrs = ["resolve_control_flow.h"],
     deps = [
         "//common:check",
-        "//executable_semantics/ast",
-        "//executable_semantics/ast:declaration",
-        "//executable_semantics/ast:return_term",
-        "//executable_semantics/ast:statement",
-        "//executable_semantics/common:error_builders",
-        "//executable_semantics/common:nonnull",
+        "//explorer/ast",
+        "//explorer/ast:declaration",
+        "//explorer/ast:return_term",
+        "//explorer/ast:statement",
+        "//explorer/common:error_builders",
+        "//explorer/common:nonnull",
         "@llvm-project//llvm:Support",
     ],
 )
@@ -170,14 +170,14 @@ cc_library(
     hdrs = ["resolve_names.h"],
     deps = [
         "//common:check",
-        "//executable_semantics/ast",
-        "//executable_semantics/ast:declaration",
-        "//executable_semantics/ast:expression",
-        "//executable_semantics/ast:pattern",
-        "//executable_semantics/ast:return_term",
-        "//executable_semantics/ast:statement",
-        "//executable_semantics/ast:static_scope",
-        "//executable_semantics/common:arena",
+        "//explorer/ast",
+        "//explorer/ast:declaration",
+        "//explorer/ast:expression",
+        "//explorer/ast:pattern",
+        "//explorer/ast:return_term",
+        "//explorer/ast:statement",
+        "//explorer/ast:static_scope",
+        "//explorer/common:arena",
         "@llvm-project//llvm:Support",
     ],
 )
@@ -203,13 +203,13 @@ cc_library(
         ":dictionary",
         ":interpreter",
         "//common:ostream",
-        "//executable_semantics/ast",
-        "//executable_semantics/ast:declaration",
-        "//executable_semantics/ast:expression",
-        "//executable_semantics/ast:statement",
-        "//executable_semantics/common:arena",
-        "//executable_semantics/common:error_builders",
-        "//executable_semantics/common:nonnull",
+        "//explorer/ast",
+        "//explorer/ast:declaration",
+        "//explorer/ast:expression",
+        "//explorer/ast:statement",
+        "//explorer/common:arena",
+        "//explorer/common:error_builders",
+        "//explorer/common:nonnull",
         "@llvm-project//llvm:Support",
     ],
 )

executable_semantics/interpreter/README.md → explorer/interpreter/README.md

@@ -1,4 +1,4 @@
-# `executable_semantics` execution
+# `explorer` execution
 
 <!--
 Part of the Carbon Language project, under the Apache License v2.0 with LLVM

executable_semantics/interpreter/action.cpp → explorer/interpreter/action.cpp

@@ -2,7 +2,7 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "executable_semantics/interpreter/action.h"
+#include "explorer/interpreter/action.h"
 
 #include <iterator>
 #include <map>
@@ -10,10 +10,10 @@
 #include <utility>
 #include <vector>
 
-#include "executable_semantics/ast/declaration.h"
-#include "executable_semantics/ast/expression.h"
-#include "executable_semantics/common/arena.h"
-#include "executable_semantics/interpreter/stack.h"
+#include "explorer/ast/declaration.h"
+#include "explorer/ast/expression.h"
+#include "explorer/common/arena.h"
+#include "explorer/interpreter/stack.h"
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/Support/Casting.h"
 

executable_semantics/interpreter/action.h → explorer/interpreter/action.h

@@ -2,20 +2,20 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef EXECUTABLE_SEMANTICS_INTERPRETER_ACTION_H_
-#define EXECUTABLE_SEMANTICS_INTERPRETER_ACTION_H_
+#ifndef EXPLORER_INTERPRETER_ACTION_H_
+#define EXPLORER_INTERPRETER_ACTION_H_
 
 #include <map>
 #include <vector>
 
 #include "common/ostream.h"
-#include "executable_semantics/ast/expression.h"
-#include "executable_semantics/ast/pattern.h"
-#include "executable_semantics/ast/statement.h"
-#include "executable_semantics/interpreter/dictionary.h"
-#include "executable_semantics/interpreter/heap_allocation_interface.h"
-#include "executable_semantics/interpreter/stack.h"
-#include "executable_semantics/interpreter/value.h"
+#include "explorer/ast/expression.h"
+#include "explorer/ast/pattern.h"
+#include "explorer/ast/statement.h"
+#include "explorer/interpreter/dictionary.h"
+#include "explorer/interpreter/heap_allocation_interface.h"
+#include "explorer/interpreter/stack.h"
+#include "explorer/interpreter/value.h"
 #include "llvm/Support/Compiler.h"
 
 namespace Carbon {
@@ -251,4 +251,4 @@ class ScopeAction : public Action {
 
 }  // namespace Carbon
 
-#endif  // EXECUTABLE_SEMANTICS_INTERPRETER_ACTION_H_
+#endif  // EXPLORER_INTERPRETER_ACTION_H_

executable_semantics/interpreter/action_stack.cpp → explorer/interpreter/action_stack.cpp

@@ -2,9 +2,9 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "executable_semantics/interpreter/action_stack.h"
+#include "explorer/interpreter/action_stack.h"
 
-#include "executable_semantics/interpreter/action.h"
+#include "explorer/interpreter/action.h"
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/Support/Casting.h"
 #include "llvm/Support/Error.h"

executable_semantics/interpreter/action_stack.h → explorer/interpreter/action_stack.h

@@ -2,16 +2,16 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef EXECUTABLE_SEMANTICS_INTERPRETER_ACTION_STACK_H_
-#define EXECUTABLE_SEMANTICS_INTERPRETER_ACTION_STACK_H_
+#ifndef EXPLORER_INTERPRETER_ACTION_STACK_H_
+#define EXPLORER_INTERPRETER_ACTION_STACK_H_
 
 #include <memory>
 #include <optional>
 
 #include "common/ostream.h"
-#include "executable_semantics/ast/statement.h"
-#include "executable_semantics/interpreter/action.h"
-#include "executable_semantics/interpreter/value.h"
+#include "explorer/ast/statement.h"
+#include "explorer/interpreter/action.h"
+#include "explorer/interpreter/value.h"
 
 namespace Carbon {
 
@@ -128,4 +128,4 @@ class ActionStack {
 
 }  // namespace Carbon
 
-#endif  // EXECUTABLE_SEMANTICS_INTERPRETER_ACTION_STACK_H_
+#endif  // EXPLORER_INTERPRETER_ACTION_STACK_H_

executable_semantics/interpreter/address.h → explorer/interpreter/address.h

@@ -2,15 +2,15 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef EXECUTABLE_SEMANTICS_INTERPRETER_ADDRESS_H_
-#define EXECUTABLE_SEMANTICS_INTERPRETER_ADDRESS_H_
+#ifndef EXPLORER_INTERPRETER_ADDRESS_H_
+#define EXPLORER_INTERPRETER_ADDRESS_H_
 
 #include <cstdint>
 #include <string>
 #include <vector>
 
 #include "common/ostream.h"
-#include "executable_semantics/interpreter/field_path.h"
+#include "explorer/interpreter/field_path.h"
 #include "llvm/Support/Compiler.h"
 
 namespace Carbon {
@@ -84,4 +84,4 @@ class Address {
 
 }  // namespace Carbon
 
-#endif  // EXECUTABLE_SEMANTICS_INTERPRETER_ADDRESS_H_
+#endif  // EXPLORER_INTERPRETER_ADDRESS_H_

executable_semantics/interpreter/dictionary.h → explorer/interpreter/dictionary.h

@@ -2,13 +2,13 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef EXECUTABLE_SEMANTICS_INTERPRETER_DICTIONARY_H_
-#define EXECUTABLE_SEMANTICS_INTERPRETER_DICTIONARY_H_
+#ifndef EXPLORER_INTERPRETER_DICTIONARY_H_
+#define EXPLORER_INTERPRETER_DICTIONARY_H_
 
 #include <iterator>
 #include <optional>
 
-#include "executable_semantics/common/arena.h"
+#include "explorer/common/arena.h"
 
 namespace Carbon {
 
@@ -101,4 +101,4 @@ class Dictionary {
 
 }  // namespace Carbon
 
-#endif  // EXECUTABLE_SEMANTICS_INTERPRETER_DICTIONARY_H_
+#endif  // EXPLORER_INTERPRETER_DICTIONARY_H_

executable_semantics/interpreter/exec_program.cpp → explorer/interpreter/exec_program.cpp

@@ -2,17 +2,17 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "executable_semantics/interpreter/exec_program.h"
+#include "explorer/interpreter/exec_program.h"
 
 #include <variant>
 
 #include "common/check.h"
 #include "common/ostream.h"
-#include "executable_semantics/common/arena.h"
-#include "executable_semantics/interpreter/interpreter.h"
-#include "executable_semantics/interpreter/resolve_control_flow.h"
-#include "executable_semantics/interpreter/resolve_names.h"
-#include "executable_semantics/interpreter/type_checker.h"
+#include "explorer/common/arena.h"
+#include "explorer/interpreter/interpreter.h"
+#include "explorer/interpreter/resolve_control_flow.h"
+#include "explorer/interpreter/resolve_names.h"
+#include "explorer/interpreter/type_checker.h"
 #include "llvm/Support/Error.h"
 
 namespace Carbon {

executable_semantics/interpreter/exec_program.h → explorer/interpreter/exec_program.h

@@ -6,10 +6,10 @@
 // statement. The intent is to minimize the amount of C++ in the .ypp file, to
 // improve ease of maintenance.
 
-#ifndef EXECUTABLE_SEMANTICS_INTERPRETER_EXEC_PROGRAM_H_
-#define EXECUTABLE_SEMANTICS_INTERPRETER_EXEC_PROGRAM_H_
+#ifndef EXPLORER_INTERPRETER_EXEC_PROGRAM_H_
+#define EXPLORER_INTERPRETER_EXEC_PROGRAM_H_
 
-#include "executable_semantics/ast/ast.h"
+#include "explorer/ast/ast.h"
 #include "llvm/Support/raw_ostream.h"
 
 namespace Carbon {
@@ -21,4 +21,4 @@ auto ExecProgram(Nonnull<Arena*> arena, AST ast,
 
 }  // namespace Carbon
 
-#endif  // EXECUTABLE_SEMANTICS_INTERPRETER_EXEC_PROGRAM_H_
+#endif  // EXPLORER_INTERPRETER_EXEC_PROGRAM_H_

executable_semantics/interpreter/field_path.h → explorer/interpreter/field_path.h

@@ -2,14 +2,14 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef EXECUTABLE_SEMANTICS_INTERPRETER_FIELD_PATH_H_
-#define EXECUTABLE_SEMANTICS_INTERPRETER_FIELD_PATH_H_
+#ifndef EXPLORER_INTERPRETER_FIELD_PATH_H_
+#define EXPLORER_INTERPRETER_FIELD_PATH_H_
 
 #include <string>
 #include <vector>
 
 #include "common/ostream.h"
-#include "executable_semantics/ast/static_scope.h"
+#include "explorer/ast/static_scope.h"
 #include "llvm/Support/Compiler.h"
 
 namespace Carbon {
@@ -91,4 +91,4 @@ class FieldPath {
 
 }  // namespace Carbon
 
-#endif  // EXECUTABLE_SEMANTICS_INTERPRETER_FIELD_PATH_H_
+#endif  // EXPLORER_INTERPRETER_FIELD_PATH_H_

executable_semantics/interpreter/heap.cpp → explorer/interpreter/heap.cpp

@@ -2,9 +2,9 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "executable_semantics/interpreter/heap.h"
+#include "explorer/interpreter/heap.h"
 
-#include "executable_semantics/common/error_builders.h"
+#include "explorer/common/error_builders.h"
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/Support/Error.h"
 

executable_semantics/interpreter/heap.h → explorer/interpreter/heap.h

@@ -2,17 +2,17 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef EXECUTABLE_SEMANTICS_INTERPRETER_HEAP_H_
-#define EXECUTABLE_SEMANTICS_INTERPRETER_HEAP_H_
+#ifndef EXPLORER_INTERPRETER_HEAP_H_
+#define EXPLORER_INTERPRETER_HEAP_H_
 
 #include <vector>
 
 #include "common/ostream.h"
-#include "executable_semantics/common/nonnull.h"
-#include "executable_semantics/common/source_location.h"
-#include "executable_semantics/interpreter/address.h"
-#include "executable_semantics/interpreter/heap_allocation_interface.h"
-#include "executable_semantics/interpreter/value.h"
+#include "explorer/common/nonnull.h"
+#include "explorer/common/source_location.h"
+#include "explorer/interpreter/address.h"
+#include "explorer/interpreter/heap_allocation_interface.h"
+#include "explorer/interpreter/value.h"
 
 namespace Carbon {
 
@@ -60,4 +60,4 @@ class Heap : public HeapAllocationInterface {
 
 }  // namespace Carbon
 
-#endif  // EXECUTABLE_SEMANTICS_INTERPRETER_HEAP_H_
+#endif  // EXPLORER_INTERPRETER_HEAP_H_

executable_semantics/interpreter/heap_allocation_interface.h → explorer/interpreter/heap_allocation_interface.h

@@ -2,12 +2,12 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef EXECUTABLE_SEMANTICS_INTERPRETER_HEAP_ALLOCATION_INTERFACE_H_
-#define EXECUTABLE_SEMANTICS_INTERPRETER_HEAP_ALLOCATION_INTERFACE_H_
+#ifndef EXPLORER_INTERPRETER_HEAP_ALLOCATION_INTERFACE_H_
+#define EXPLORER_INTERPRETER_HEAP_ALLOCATION_INTERFACE_H_
 
-#include "executable_semantics/common/arena.h"
-#include "executable_semantics/common/nonnull.h"
-#include "executable_semantics/interpreter/address.h"
+#include "explorer/common/arena.h"
+#include "explorer/common/nonnull.h"
+#include "explorer/interpreter/address.h"
 
 namespace Carbon {
 
@@ -37,4 +37,4 @@ class HeapAllocationInterface {
 
 }  // namespace Carbon
 
-#endif  // EXECUTABLE_SEMANTICS_INTERPRETER_HEAP_ALLOCATION_INTERFACE_H_
+#endif  // EXPLORER_INTERPRETER_HEAP_ALLOCATION_INTERFACE_H_

executable_semantics/interpreter/impl_scope.cpp → explorer/interpreter/impl_scope.cpp

@@ -2,10 +2,10 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "executable_semantics/interpreter/impl_scope.h"
+#include "explorer/interpreter/impl_scope.h"
 
-#include "executable_semantics/interpreter/type_checker.h"
-#include "executable_semantics/interpreter/value.h"
+#include "explorer/interpreter/type_checker.h"
+#include "explorer/interpreter/value.h"
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/Support/Casting.h"
 

executable_semantics/interpreter/impl_scope.h → explorer/interpreter/impl_scope.h

@@ -2,10 +2,10 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef EXECUTABLE_SEMANTICS_AST_IMPL_SCOPE_H_
-#define EXECUTABLE_SEMANTICS_AST_IMPL_SCOPE_H_
+#ifndef EXPLORER_AST_IMPL_SCOPE_H_
+#define EXPLORER_AST_IMPL_SCOPE_H_
 
-#include "executable_semantics/ast/declaration.h"
+#include "explorer/ast/declaration.h"
 
 namespace Carbon {
 
@@ -110,4 +110,4 @@ class ImplScope {
 
 }  // namespace Carbon
 
-#endif  // EXECUTABLE_SEMANTICS_AST_IMPL_SCOPE_H_
+#endif  // EXPLORER_AST_IMPL_SCOPE_H_

executable_semantics/interpreter/interpreter.cpp → explorer/interpreter/interpreter.cpp

@@ -2,7 +2,7 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "executable_semantics/interpreter/interpreter.h"
+#include "explorer/interpreter/interpreter.h"
 
 #include <iterator>
 #include <map>
@@ -12,13 +12,13 @@
 #include <vector>
 
 #include "common/check.h"
-#include "executable_semantics/ast/declaration.h"
-#include "executable_semantics/ast/expression.h"
-#include "executable_semantics/common/arena.h"
-#include "executable_semantics/common/error_builders.h"
-#include "executable_semantics/interpreter/action.h"
-#include "executable_semantics/interpreter/action_stack.h"
-#include "executable_semantics/interpreter/stack.h"
+#include "explorer/ast/declaration.h"
+#include "explorer/ast/expression.h"
+#include "explorer/common/arena.h"
+#include "explorer/common/error_builders.h"
+#include "explorer/interpreter/action.h"
+#include "explorer/interpreter/action_stack.h"
+#include "explorer/interpreter/stack.h"
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/Support/Casting.h"
 #include "llvm/Support/Error.h"

executable_semantics/interpreter/interpreter.h → explorer/interpreter/interpreter.h

@@ -2,21 +2,21 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef EXECUTABLE_SEMANTICS_INTERPRETER_INTERPRETER_H_
-#define EXECUTABLE_SEMANTICS_INTERPRETER_INTERPRETER_H_
+#ifndef EXPLORER_INTERPRETER_INTERPRETER_H_
+#define EXPLORER_INTERPRETER_INTERPRETER_H_
 
 #include <optional>
 #include <utility>
 #include <vector>
 
 #include "common/ostream.h"
-#include "executable_semantics/ast/ast.h"
-#include "executable_semantics/ast/declaration.h"
-#include "executable_semantics/ast/expression.h"
-#include "executable_semantics/ast/pattern.h"
-#include "executable_semantics/interpreter/action.h"
-#include "executable_semantics/interpreter/heap.h"
-#include "executable_semantics/interpreter/value.h"
+#include "explorer/ast/ast.h"
+#include "explorer/ast/declaration.h"
+#include "explorer/ast/expression.h"
+#include "explorer/ast/pattern.h"
+#include "explorer/interpreter/action.h"
+#include "explorer/interpreter/heap.h"
+#include "explorer/interpreter/value.h"
 #include "llvm/ADT/ArrayRef.h"
 
 namespace Carbon {
@@ -57,4 +57,4 @@ auto InterpPattern(Nonnull<const Pattern*> p, Nonnull<Arena*> arena,
 
 }  // namespace Carbon
 
-#endif  // EXECUTABLE_SEMANTICS_INTERPRETER_INTERPRETER_H_
+#endif  // EXPLORER_INTERPRETER_INTERPRETER_H_

executable_semantics/interpreter/resolve_control_flow.cpp → explorer/interpreter/resolve_control_flow.cpp

@@ -2,12 +2,12 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "executable_semantics/interpreter/resolve_control_flow.h"
+#include "explorer/interpreter/resolve_control_flow.h"
 
-#include "executable_semantics/ast/declaration.h"
-#include "executable_semantics/ast/return_term.h"
-#include "executable_semantics/ast/statement.h"
-#include "executable_semantics/common/error_builders.h"
+#include "explorer/ast/declaration.h"
+#include "explorer/ast/return_term.h"
+#include "explorer/ast/statement.h"
+#include "explorer/common/error_builders.h"
 #include "llvm/Support/Casting.h"
 #include "llvm/Support/Error.h"
 

executable_semantics/interpreter/resolve_control_flow.h → explorer/interpreter/resolve_control_flow.h

@@ -2,11 +2,11 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef EXECUTABLE_SEMANTICS_INTERPRETER_RESOLVE_CONTROL_FLOW_H_
-#define EXECUTABLE_SEMANTICS_INTERPRETER_RESOLVE_CONTROL_FLOW_H_
+#ifndef EXPLORER_INTERPRETER_RESOLVE_CONTROL_FLOW_H_
+#define EXPLORER_INTERPRETER_RESOLVE_CONTROL_FLOW_H_
 
-#include "executable_semantics/ast/ast.h"
-#include "executable_semantics/common/nonnull.h"
+#include "explorer/ast/ast.h"
+#include "explorer/common/nonnull.h"
 
 namespace Carbon {
 
@@ -18,4 +18,4 @@ auto ResolveControlFlow(AST& ast) -> ErrorOr<Success>;
 
 }  // namespace Carbon
 
-#endif  // EXECUTABLE_SEMANTICS_INTERPRETER_RESOLVE_CONTROL_FLOW_H_
+#endif  // EXPLORER_INTERPRETER_RESOLVE_CONTROL_FLOW_H_

executable_semantics/interpreter/resolve_names.cpp → explorer/interpreter/resolve_names.cpp

@@ -2,15 +2,15 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "executable_semantics/interpreter/resolve_names.h"
+#include "explorer/interpreter/resolve_names.h"
 
 #include <set>
 
-#include "executable_semantics/ast/declaration.h"
-#include "executable_semantics/ast/expression.h"
-#include "executable_semantics/ast/pattern.h"
-#include "executable_semantics/ast/statement.h"
-#include "executable_semantics/ast/static_scope.h"
+#include "explorer/ast/declaration.h"
+#include "explorer/ast/expression.h"
+#include "explorer/ast/pattern.h"
+#include "explorer/ast/statement.h"
+#include "explorer/ast/static_scope.h"
 #include "llvm/Support/Casting.h"
 #include "llvm/Support/Error.h"
 

executable_semantics/interpreter/resolve_names.h → explorer/interpreter/resolve_names.h

@@ -2,11 +2,11 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef EXECUTABLE_SEMANTICS_INTERPRETER_RESOLVE_NAMES_H_
-#define EXECUTABLE_SEMANTICS_INTERPRETER_RESOLVE_NAMES_H_
+#ifndef EXPLORER_INTERPRETER_RESOLVE_NAMES_H_
+#define EXPLORER_INTERPRETER_RESOLVE_NAMES_H_
 
-#include "executable_semantics/ast/ast.h"
-#include "executable_semantics/common/arena.h"
+#include "explorer/ast/ast.h"
+#include "explorer/common/arena.h"
 
 namespace Carbon {
 
@@ -17,4 +17,4 @@ auto ResolveNames(AST& ast) -> ErrorOr<Success>;
 
 }  // namespace Carbon
 
-#endif  // EXECUTABLE_SEMANTICS_INTERPRETER_RESOLVE_CONTROL_FLOW_H_
+#endif  // EXPLORER_INTERPRETER_RESOLVE_CONTROL_FLOW_H_