rust/rust-builtins.o \
rust/rust-feature.o \
rust/rust-feature-gate.o \
+ rust/rust-dir-owner.o \
$(END)
# removed object files from here
#include "rust-lex.h"
#include "rust-parse.h"
#include "rust-operators.h"
+#include "rust-dir-owner.h"
/* Compilation unit used for various AST-related functions that would make
* the headers too long if they were defined inline and don't receive any
// This corresponds to the path of the file 'including' the module. So the
// file that contains the 'mod <file>;' directive
- std::string including_fname (outer_filename);
+ std::string including_fpath (outer_filename);
std::string expected_file_path = module_name + ".rs";
std::string expected_dir_path = "mod.rs";
- auto dir_slash_pos = including_fname.rfind (file_separator);
+ auto dir_slash_pos = including_fpath.rfind (file_separator);
std::string current_directory_name;
+ std::string including_fname;
- // If we haven't found a file_separator, then we have to look for files in the
- // current directory ('.')
+ // If we haven't found a file_separator, then we may have to look for files in
+ // the current directory ('.')
if (dir_slash_pos == std::string::npos)
- current_directory_name = std::string (".") + file_separator;
+ {
+ including_fname = std::move (including_fpath);
+ including_fpath = std::string (".") + file_separator + including_fname;
+ dir_slash_pos = 1;
+ }
else
- current_directory_name
- = including_fname.substr (0, dir_slash_pos) + file_separator;
+ {
+ including_fname = including_fpath.substr (dir_slash_pos + 1);
+ }
+
+ current_directory_name
+ = including_fpath.substr (0, dir_slash_pos) + file_separator;
+
+ auto path_string = filename_from_path_attribute (get_outer_attrs ());
+
+ std::string including_subdir;
+ if (path_string.empty () && module_scope.empty ()
+ && get_file_subdir (including_fname, including_subdir))
+ current_directory_name += including_subdir + file_separator;
// Handle inline module declarations adding path components.
for (auto const &name : module_scope)
current_directory_name.append (file_separator);
}
- auto path_string = filename_from_path_attribute (get_outer_attrs ());
if (!path_string.empty ())
{
module_file = current_directory_name + path_string;
#define INCLUDE_ALGORITHM
#include "rust-diagnostics.h"
#include "rust-make-unique.h"
+#include "rust-dir-owner.h"
namespace Rust {
// Left binding powers of operations.
// parse inner attributes
AST::AttrVec inner_attrs = parse_inner_attributes ();
+ std::string default_path = name;
+
+ if (inline_module_stack.empty ())
+ {
+ std::string filename = lexer.get_filename ();
+ auto slash_idx = filename.rfind (file_separator);
+ if (slash_idx == std::string::npos)
+ slash_idx = 0;
+ else
+ slash_idx++;
+ filename = filename.substr (slash_idx);
+
+ std::string subdir;
+ if (get_file_subdir (filename, subdir))
+ default_path = subdir + file_separator + name;
+ }
+
std::string module_path_name
- = extract_module_path (inner_attrs, outer_attrs, name);
+ = extract_module_path (inner_attrs, outer_attrs, default_path);
InlineModuleStackScope scope (*this, std::move (module_path_name));
// parse items
--- /dev/null
+// Copyright (C) 2023 Free Software Foundation, Inc.
+
+// This file is part of GCC.
+
+// GCC is free software; you can redistribute it and/or modify it under
+// the terms of the GNU General Public License as published by the Free
+// Software Foundation; either version 3, or (at your option) any later
+// version.
+
+// GCC is distributed in the hope that it will be useful, but WITHOUT ANY
+// WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+// for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with GCC; see the file COPYING3. If not see
+// <http://www.gnu.org/licenses/>.
+
+// Handles non-mod-rs and mod-rs file differentiation
+
+#include "rust-system.h"
+#include "rust-dir-owner.h"
+
+namespace Rust {
+
+// extracts the owned subdirectory name from a file name
+bool
+get_file_subdir (const std::string &filename, std::string &subdir)
+{
+ // directory owning filenames
+ if (filename == "mod.rs" || filename == "lib.rs" || filename == "main.rs")
+ return false;
+
+ // files not ending in ".rs" are directory owners
+ if (filename.size () < 3 || filename.compare (filename.size () - 3, 3, ".rs"))
+ return false;
+
+ subdir = filename.substr (0, filename.size () - 3);
+ return true;
+}
+
+} // namespace Rust
--- /dev/null
+// Copyright (C) 2023 Free Software Foundation, Inc.
+
+// This file is part of GCC.
+
+// GCC is free software; you can redistribute it and/or modify it under
+// the terms of the GNU General Public License as published by the Free
+// Software Foundation; either version 3, or (at your option) any later
+// version.
+
+// GCC is distributed in the hope that it will be useful, but WITHOUT ANY
+// WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+// for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with GCC; see the file COPYING3. If not see
+// <http://www.gnu.org/licenses/>.
+
+// Handles non-mod-rs and mod-rs file differentiation
+
+#ifndef RUST_DIR_OWNER
+#define RUST_DIR_OWNER
+
+#include "rust-system.h"
+
+namespace Rust {
+
+// extracts the owned subdirectory name from a file name
+bool
+get_file_subdir (const std::string &filename, std::string &subdir);
+
+} // namespace Rust
+
+#endif // RUST_DIR_OWNER
mod explicit;
}
-#[path = "missing_middle"]
+#[path = "mod_missing_middle/missing_middle"]
mod with_outer_path_attr {
#[path = "outer_path.rs"]
mod inner;
}
mod with_inner_path_attr {
- #![path = "missing_middle"]
+ #![path = "mod_missing_middle/missing_middle"]
#[path = "inner_path.rs"]
mod inner;
}
-#[path = "missing_middle"]
+#[path = "mod_missing_middle/missing_middle"]
mod with_both_path_attr {
#![path = "this_is_ignored"]
projects / thirdparty / gcc.git / commitdiff
