summaryrefslogtreecommitdiff
path: root/src/ast
diff options
context:
space:
mode:
Diffstat (limited to 'src/ast')
-rw-r--r--src/ast/item.cpp1
-rw-r--r--src/ast/item.hpp1
-rw-r--r--src/ast/item_test.cpp8
3 files changed, 3 insertions, 7 deletions
diff --git a/src/ast/item.cpp b/src/ast/item.cpp
index bd4f295..d27e231 100644
--- a/src/ast/item.cpp
+++ b/src/ast/item.cpp
@@ -128,7 +128,6 @@ namespace item
Item item;
SPAN_EXTRACT(first, item.id);
SPAN_EXTRACT(TRY_UNWRAP(lex_nonscript(lr, false), return EOL_ERROR(lr)), item.name);
- SPAN_EXTRACT(TRY_UNWRAP(lex_nonscript(lr, false), return EOL_ERROR(lr)), item.jname);
SPAN_EXTRACT(TRY_UNWRAP(lex_nonscript(lr, false), return EOL_ERROR(lr)), item.type);
SPAN_EXTRACT(TRY_UNWRAP(lex_nonscript(lr, false), return EOL_ERROR(lr)), item.buy_price);
SPAN_EXTRACT(TRY_UNWRAP(lex_nonscript(lr, false), return EOL_ERROR(lr)), item.sell_price);
diff --git a/src/ast/item.hpp b/src/ast/item.hpp
index a8fe908..c772655 100644
--- a/src/ast/item.hpp
+++ b/src/ast/item.hpp
@@ -49,7 +49,6 @@ namespace item
{
Spanned<ItemNameId> id;
Spanned<ItemName> name;
- Spanned<ItemName> jname;
Spanned<ItemType> type;
Spanned<int> buy_price;
Spanned<int> sell_price;
diff --git a/src/ast/item_test.cpp b/src/ast/item_test.cpp
index a77662e..6e2cee7 100644
--- a/src/ast/item_test.cpp
+++ b/src/ast/item_test.cpp
@@ -89,9 +89,9 @@ namespace item
{
// 1 2 3 4 5
//2345678901234567890123456789012345678901234567890123456789
- "1,abc , def,3,4,5,6,7,8,9,10,xx,2,16,12,13,11, {end;}, {}"_s,
- "1,abc , def,3,4,5,6,7,8,9,10,xx,2,16,12,13,11, {end;}, {}\n"_s,
- "1,abc , def,3,4,5,6,7,8,9,10,xx,2,16,12,13,11, {end;}, {}\nabc"_s,
+ "1,abc , 3,4,5,6,7,8,9,10,xx,2,16,12,13,11, {end;}, {}"_s,
+ "1,abc , 3,4,5,6,7,8,9,10,xx,2,16,12,13,11, {end;}, {}\n"_s,
+ "1,abc , 3,4,5,6,7,8,9,10,xx,2,16,12,13,11, {end;}, {}\nabc"_s,
};
for (auto input : inputs)
{
@@ -108,8 +108,6 @@ namespace item
EXPECT_EQ(p->id.data, wrap<ItemNameId>(1));
EXPECT_SPAN(p->name.span, 1,3, 1,6);
EXPECT_EQ(p->name.data, stringish<ItemName>("abc "_s));
- EXPECT_SPAN(p->jname.span, 1,10, 1,12);
- EXPECT_EQ(p->jname.data, stringish<ItemName>("def"_s));
EXPECT_SPAN(p->type.span, 1,14, 1,14);
EXPECT_EQ(p->type.data, ItemType::JUNK);
EXPECT_SPAN(p->buy_price.span, 1,16, 1,16);