Skip to content

Fixes #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adamdempsey90 merged 3 commits into from
May 7, 2026
Merged

Fixes #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cf4a631
Fix global var curr suit bug
May 7, 2026
cd801a9
Update pips
May 7, 2026
5642a96
make sure name_prefix and global_name are set
May 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion external/pips
Open in desktop
Submodule pips updated 11 files
+3 −6 pips/chunk.hpp
+69 −43 pips/compiler.hpp
+57 −50 pips/math.hpp
+84 −46 pips/readline.hpp
+47 −31 pips/scanner.hpp
+2 −2 pips/types.hpp
+5 −6 pips/utils.hpp
+8 −5 pips/value.hpp
+1 −2 pips/value_types.hpp
+134 −88 pips/vm.hpp
+68 −65 repl/main.cpp
22 changes: 17 additions & 5 deletions rummy/deck.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,13 +287,25 @@ void Deck::CompileStream(std::istream &ss, std::map<std::string, CardMeta> &meta
local_name = local_name.substr(dot_pos + 1, std::string::npos);
std::replace(suit_name.begin(), suit_name.end(), '.', '/');
curr_suit = suit_name;
name_prefix = suit_name + ".";
}
} else {
std::string suit_card_name = curr_suit;
std::replace(suit_card_name.begin(), suit_card_name.end(), '/', '.');
// use suit name as prefix
name_prefix = suit_card_name + ".";
global_name = name_prefix + local_name;
// standalone variable needs to reset curr_suit
if (local_name.find('.') != std::string::npos) {
auto dot_pos = local_name.find_last_of('.');
std::string suit_name = local_name.substr(0, dot_pos);
local_name = local_name.substr(dot_pos + 1, std::string::npos);
std::replace(suit_name.begin(), suit_name.end(), '.', '/');
name_prefix = suit_name + ".";
global_name = name_prefix + local_name;
curr_suit = suit_name;
} else {
std::string suit_card_name = curr_suit;
std::replace(suit_card_name.begin(), suit_card_name.end(), '/', '.');
// use suit name as prefix
name_prefix = suit_card_name + ".";
global_name = name_prefix + local_name;
}
}

// Variable updates
Expand Down
Loading