encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-12-21 18:59:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up the ScopeStack interface

Browse Source 
There's no need for the ScopeStack to include 'global' information. This
is easily obtainable from the element type.
Replace the get-by-reference, with a simpler return value.

Change-Id: Ic6f4c0f656a2019417d68ffb3fe85ba8343ad15e
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/68403
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: James Price <jrprice@google.com>
This commit is contained in:
Ben Clayton
2021-11-04 22:29:22 +00:00
parent 307eff0da4
commit 89d8b2b7a5
4 changed files with 85 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
src/scope_stack_test.cc
View File

@@ -21,78 +21,32 @@ namespace {
class ScopeStackTest : public ProgramBuilder, public testing::Test {};
TEST_F(ScopeStackTest, Global) {
TEST_F(ScopeStackTest, Get) {
ScopeStack<uint32_t> s;
Symbol sym(1, ID());
s.set_global(sym, 5);
Symbol a(1, ID());
Symbol b(3, ID());
s.Push();
s.Set(a, 5u);
s.Set(b, 10u);
uint32_t val = 0;
EXPECT_TRUE(s.get(sym, &val));
EXPECT_EQ(val, 5u);
}
EXPECT_EQ(s.Get(a), 5u);
EXPECT_EQ(s.Get(b), 10u);
TEST_F(ScopeStackTest, Global_SetWithPointer) {
auto* v = Var("my_var", ty.f32(), ast::StorageClass::kNone);
ScopeStack<const ast::Variable*> s;
s.set_global(v->symbol, v);
s.Push();
const ast::Variable* v2 = nullptr;
EXPECT_TRUE(s.get(v->symbol, &v2));
EXPECT_EQ(v2->symbol, v->symbol);
}
s.Set(a, 15u);
EXPECT_EQ(s.Get(a), 15u);
EXPECT_EQ(s.Get(b), 10u);
TEST_F(ScopeStackTest, Global_CanNotPop) {
ScopeStack<uint32_t> s;
Symbol sym(1, ID());
s.set_global(sym, 5);
s.pop_scope();
uint32_t val = 0;
EXPECT_TRUE(s.get(sym, &val));
EXPECT_EQ(val, 5u);
}
TEST_F(ScopeStackTest, Scope) {
ScopeStack<uint32_t> s;
Symbol sym(1, ID());
s.push_scope();
s.set(sym, 5);
uint32_t val = 0;
EXPECT_TRUE(s.get(sym, &val));
EXPECT_EQ(val, 5u);
s.Pop();
EXPECT_EQ(s.Get(a), 5u);
EXPECT_EQ(s.Get(b), 10u);
}
TEST_F(ScopeStackTest, Get_MissingSymbol) {
ScopeStack<uint32_t> s;
Symbol sym(1, ID());
uint32_t ret = 0;
EXPECT_FALSE(s.get(sym, &ret));
EXPECT_EQ(ret, 0u);
}
TEST_F(ScopeStackTest, Has) {
ScopeStack<uint32_t> s;
Symbol sym(1, ID());
Symbol sym2(2, ID());
s.set_global(sym2, 3);
s.push_scope();
s.set(sym, 5);
EXPECT_TRUE(s.has(sym));
EXPECT_TRUE(s.has(sym2));
}
TEST_F(ScopeStackTest, ReturnsScopeBeforeGlobalFirst) {
ScopeStack<uint32_t> s;
Symbol sym(1, ID());
s.set_global(sym, 3);
s.push_scope();
s.set(sym, 5);
uint32_t ret;
EXPECT_TRUE(s.get(sym, &ret));
EXPECT_EQ(ret, 5u);
EXPECT_EQ(s.Get(sym), 0u);
}
} // namespace