From 75e947fa0021547f460496d1c3aef5b61af4c669 Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Sat, 31 Mar 2018 23:05:02 -0400 Subject: Migrated generator to hkutil --- generator/lemma.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'generator/lemma.cpp') diff --git a/generator/lemma.cpp b/generator/lemma.cpp index e66b153..33ab037 100644 --- a/generator/lemma.cpp +++ b/generator/lemma.cpp @@ -1,8 +1,6 @@ #include "lemma.h" #include #include -#include "field.h" -#include "database.h" #include "form.h" namespace verbly { @@ -35,7 +33,7 @@ namespace verbly { } } - database& operator<<(database& db, const lemma& arg) + hatkirby::database& operator<<(hatkirby::database& db, const lemma& arg) { for (inflection type : { inflection::base, @@ -49,12 +47,13 @@ namespace verbly { { for (const form* f : arg.getInflections(type)) { - std::list fields; - fields.emplace_back("lemma_id", arg.getId()); - fields.emplace_back("form_id", f->getId()); - fields.emplace_back("category", static_cast(type)); - - db.insertIntoTable("lemmas_forms", std::move(fields)); + db.insertIntoTable( + "lemmas_forms", + { + { "lemma_id", arg.getId() }, + { "form_id", f->getId() }, + { "category", static_cast(type) } + }); } } -- cgit 1.4.1