Update tests cf. a73e9e5

examples/using-checker-lib-from-cpp/src/using-checker.cpp

@@ -1,5 +1,5 @@
 /*
-* Copyright (C) 2017, Kevin Brubeck Unhammer <[email protected]>
+* Copyright (C) 2017–2019, Kevin Brubeck Unhammer <[email protected]>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,6 +15,8 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+// IMPORTANT: Check any changes to this file into git before running make check!
+
 #ifdef HAVE_CONFIG_H
 #  include <config.h>
 #endif
@@ -70,7 +72,8 @@ int runAr(const std::string& path, const std::u16string& pipename, bool verbose)
 				  << " beg=" << e.beg
 				  << " end=" << e.end
 				  << " err=" << utf16conv.to_bytes(e.err)
-				  << " msg=" << utf16conv.to_bytes(e.msg);
+				  << " msg=" << utf16conv.to_bytes(e.msg.first)
+				  << " dsc=" << utf16conv.to_bytes(e.msg.second);
 			for(const auto& r : e.rep) {
 				std::cout << " rep=" << utf16conv.to_bytes(r);
 			}

python/libdivvun.i

@@ -81,12 +81,13 @@ wrap_unique_ptr(CheckerUniquePtr, divvun::Checker);
 			size_t beg;
 			size_t end;
 			std::string err;
-			std::string msg;
+			std::string dsc;
 			StringVector rep;
+                        std::string msg;
 	};
 
-	typedef std::map<std::string, std::string> ToggleIdsBytes;      // toggleIds[errtype] = msg;
-	typedef std::vector<std::pair<std::string, std::string> > ToggleResBytes; // toggleRes = [(errtype_regex, msg), …];
+	typedef std::map<std::string, std::pair<std::string, std::string>> ToggleIdsBytes;      // toggleIds[errtype] = msg;
+	typedef std::vector<std::pair<std::string, std::pair<std::string, std::string>> > ToggleResBytes; // toggleRes = [(errtype_regex, msg), …];
 
 	struct OptionBytes {
 			std::string type;
@@ -134,17 +135,19 @@ wrap_unique_ptr(CheckerUniquePtr, divvun::Checker);
 				utf8::utf16to8(r.begin(), r.end(), std::back_inserter(r8));
 				rep.push_back(r8);
 			}
-			std::string form8, err8, msg8;
+			std::string form8, err8, msg8, dsc8;
 			utf8::utf16to8(e.form.begin(), e.form.end(), std::back_inserter(form8));
 			utf8::utf16to8(e.err.begin(), e.err.end(), std::back_inserter(err8));
-			utf8::utf16to8(e.msg.begin(), e.msg.end(), std::back_inserter(msg8));
+			utf8::utf16to8(e.msg.first.begin(), e.msg.first.end(), std::back_inserter(msg8));
+			utf8::utf16to8(e.msg.second.begin(), e.msg.second.end(), std::back_inserter(dsc8));
 			errs_bytes.push_back({
 				form8,
 				e.beg,
 				e.end,
 				err8,
-				msg8,
-				rep
+				dsc8,
+				rep,
+                                msg8
 			});
 		}
 		return errs_bytes;
@@ -157,13 +160,13 @@ wrap_unique_ptr(CheckerUniquePtr, divvun::Checker);
 			const divvun::Prefs& p = lp.second;
 			PrefsBytes pb;
 			for(const std::pair<divvun::ErrId, divvun::Msg>& em : p.toggleIds) {
-				pb.toggleIds[toUtf8(em.first)] = toUtf8(em.second);
+				pb.toggleIds[toUtf8(em.first)] = std::make_pair(toUtf8(em.second.first), toUtf8(em.second.second));
 			}
 			// toggleRes TODO: can we get the regex as string out?
 			for(const divvun::Option& o : p.options) {
 				ToggleIdsBytes choices;
 				for(const std::pair<divvun::ErrId, divvun::Msg>& c : o.choices) {
-					choices[toUtf8(c.first)] = toUtf8(c.second);
+					choices[toUtf8(c.first)] = std::make_pair(toUtf8(c.second.first), toUtf8(c.second.second));
 				}
 				OptionBytes ob = OptionBytes {
 					o.type, o.name, choices

test/checker/expected.archive.json

@@ -1 +1 @@
-{"errs":[["dieđuiguin",20,30,"msyn-valency-loc-com","msyn thingy",["diehtukorrekt"]]],"text":"seammas ballat ođđa dieđuiguin."}
+{"errs":[["dieđuiguin",20,30,"msyn-valency-loc-com","boasttut sátni",["diehtukorrekt"],"msyn thingy"]],"text":"seammas ballat ođđa dieđuiguin."}

test/checker/expected.spell.json

@@ -1 +1 @@
-{"errs":[["balaat",8,14,"typo","typo",["ballat"]],["dieđuiguin",27,37,"msyn-valency-loc-com","msyn thingy",["diehtukorrekt"]]],"text":"seammas balaat ballat ođđa dieđuiguin."}
+{"errs":[["balaat",8,14,"typo","typo",["ballat"],"typo"],["dieđuiguin",27,37,"msyn-valency-loc-com","boasttut sátni",["diehtukorrekt"],"msyn thingy"]],"text":"seammas balaat ballat ođđa dieđuiguin."}

test/checker/expected.xml.json

@@ -1 +1 @@
-{"errs":[["dieđuiguin",20,30,"msyn-valency-loc-com","msyn thingy",["diehtukorrekt"]],["vel",36,39,"double-space-before","double-space-before",[]]],"text":"seammas ballat ođđa dieđuiguin. Ja  vel."}
+{"errs":[["dieđuiguin",20,30,"msyn-valency-loc-com","boasttut sátni",["diehtukorrekt"],"msyn thingy"],["vel",36,39,"double-space-before","double-space-before",[],"double-space-before"]],"text":"seammas ballat ođđa dieđuiguin. Ja  vel."}

test/checker/run-lib

@@ -4,6 +4,9 @@ if ! command -V git >/dev/null 2>/dev/null; then
     # We use git to make pristine copy of ./examples; skip if we don't have git (e.g. package builders)
     echo "No git, skipping run-lib test"
     exit 77
+elif ! { git diff --quiet && git diff --cached --quiet; }; then
+    echo "You have uncommitted changes, not running run-lib test"
+    exit 77
 fi
 
 set -u
@@ -28,6 +31,7 @@ fi
 (
     cd ../..
     make --quiet install DESTDIR="${destdir}" &>>"${log}"
+    echo "done installing" &>>"${log}"
 )
 
 ls "${destdir}/${prefix}"/include/divvun/checker.hpp &>>"${log}"
@@ -57,8 +61,16 @@ fi
 make -j3     &>>"${log}"
 
 input="seammas ballat ođđa dieđuiguin"
-expected='{"errs":[["dieđuiguin",20,30,"msyn-valency-loc-com","msyn thingy",["diehtukorrekt"]]],"text":"seammas ballat ođđa dieđuiguin"}
-form=dieđuiguin beg=20 end=30 err=msyn-valency-loc-com msg=msyn thingy rep=diehtukorrekt'
-echo "${input}"                                                             \
-    | src/using-checker -a sme.zcheck -n smegram                            \
-    | diff <(printf "%s\n" "${expected}") -
+got=$(echo "${input}" | src/using-checker -a sme.zcheck -n smegram)
+expected='{"errs":[["dieđuiguin",20,30,"msyn-valency-loc-com","boasttut sátni",["diehtukorrekt"],"msyn thingy"]],"text":"seammas ballat ođđa dieđuiguin"}
+form=dieđuiguin beg=20 end=30 err=msyn-valency-loc-com msg=msyn thingy dsc=boasttut sátni rep=diehtukorrekt'
+{
+    echo "Input"
+    echo "${input}"
+    echo "Expected:"
+    echo "${expected}"
+    echo "Got:"
+    echo "${got}"
+} &>>"${log}"
+
+diff -b <(echo "${expected}") <(echo "${got}") &>>"${log}"

test/suggest/expected.addcohort-comma.json

@@ -1 +1 @@
-{"errs":[[" ja",34,37,"punct-rihkku","Rihkku",[", ja"]]],"text":"Otne leat sihke neahtta-bálvalusat ja mobiila atnuprográmmat "}
+{"errs":[[" ja",34,37,"punct-rihkku","rihkku",[", ja"],"Rihkku"]],"text":"Otne leat sihke neahtta-bálvalusat ja mobiila atnuprográmmat "}

test/suggest/expected.addcohort-intervening.json

@@ -1 +1 @@
-{"errs":[[" vel ja",34,41,"punct-rihkku","Rihkku",[", vel ja"]]],"text":"Otne leat sihke neahtta-bálvalusat vel ja mobiila atnuprográmmat "}
+{"errs":[[" vel ja",34,41,"punct-rihkku","rihkku",[", vel ja"],"Rihkku"]],"text":"Otne leat sihke neahtta-bálvalusat vel ja mobiila atnuprográmmat "}

test/suggest/expected.addcohort-right.json

@@ -1 +1 @@
-{"errs":[["ja vel ",35,42,"punct-rihkku","Rihkku",["ja vel, "]]],"text":"Otne leat sihke neahtta-bálvalusat ja vel mobiila atnuprográmmat "}
+{"errs":[["ja vel ",35,42,"punct-rihkku","rihkku",["ja vel, "],"Rihkku"]],"text":"Otne leat sihke neahtta-bálvalusat ja vel mobiila atnuprográmmat "}

test/suggest/expected.badjel.json

@@ -1 +1 @@
-{"errs":[["badjel",33,39,"lex-bokte-not-badjel","\"bokte\" iige \"badjel\"",["bokte"]]],"text":"sáddejuvvot báhpirat interneahta badjel.\n"}
+{"errs":[["badjel",33,39,"lex-bokte-not-badjel","boasttut sátni",["bokte"],"\"bokte\" iige \"badjel\""]],"text":"sáddejuvvot báhpirat interneahta badjel.\n"}

test/suggest/expected.defaults-id.json

@@ -1 +1 @@
-{"errs":[["girjii",23,29,"unreal-girjji","Čállinmeattáhus",["girjje","girjji"]],["Girjii",46,52,"real-override","gáhkku iige vuostá",["girjje","girjji"]]],"text":"Lean oainnat lohkan 42 girjii, šuohkeha Line.\nGirjii\n"}
+{"errs":[["girjii",23,29,"unreal-girjji","\"girjii\" maŋis galggašii leat blah",["girjje","girjji"],"Čállinmeattáhus"],["Girjii",46,52,"real-override","galggašii leat \"gáhkku\" iige \"vuostá\"",["girjje","girjji"],"gáhkku iige vuostá"]],"text":"Lean oainnat lohkan 42 girjii, šuohkeha Line.\nGirjii\n"}

test/suggest/expected.defaults-re.json

@@ -1 +1 @@
-{"errs":[["girjii",23,29,"real-girjji","Čállinmeattáhus",["girjje","girjji"]],["Girjii",46,52,"real-override","gáhkku iige vuostá",["girjje","girjji"]]],"text":"Lean oainnat lohkan 42 girjii, šuohkeha Line.\nGirjii\n"}
+{"errs":[["girjii",23,29,"real-girjji","Čállinmeattáhus",["girjje","girjji"],"Čállinmeattáhus"],["Girjii",46,52,"real-override","galggašii leat \"gáhkku\" iige \"vuostá\"",["girjje","girjji"],"gáhkku iige vuostá"]],"text":"Lean oainnat lohkan 42 girjii, šuohkeha Line.\nGirjii\n"}

test/suggest/expected.delete-and-suggest-right.json

@@ -1 +1 @@
-{"errs":[["lávvomuorran dego",3,20,"syn-dego-nom","dego nom",["lávvomuorra dego"]],["lávvomuorran dego",3,20,"syn-not-dego","not dego",["lávvomuorran"]]],"text":"<p>lávvomuorran dego</p>"}
+{"errs":[["lávvomuorran dego",3,20,"syn-dego-nom","blah",["lávvomuorra dego"],"dego nom"],["lávvomuorran dego",3,20,"syn-not-dego","blah",["lávvomuorran"],"not dego"]],"text":"<p>lávvomuorran dego</p>"}

test/suggest/expected.delete-and-suggest.json

@@ -1 +1 @@
-{"errs":[["dego lávvomuorran",0,17,"syn-not-dego","not dego",["lávvomuorran"]],["dego lávvomuorran",0,17,"syn-dego-nom","dego nom",["dego lávvomuorra"]]],"text":"dego lávvomuorran"}
+{"errs":[["dego lávvomuorran",0,17,"syn-not-dego","blah",["lávvomuorran"],"not dego"],["dego lávvomuorran",0,17,"syn-dego-nom","blah",["dego lávvomuorra"],"dego nom"]],"text":"dego lávvomuorran"}

test/suggest/expected.delete-multiple.json

@@ -1 +1 @@
-{"errs":[["dego dego lávvomuorran",0,22,"syn-not-dego","not dego",["lávvomuorran"]]],"text":"dego dego lávvomuorran"}
+{"errs":[["dego dego lávvomuorran",0,22,"syn-not-dego","blah",["lávvomuorran"],"not dego"]],"text":"dego dego lávvomuorran"}

test/suggest/expected.delete-multiple2.json

@@ -1 +1 @@
-{"errs":[["dego dego lávvomuorran",0,22,"syn-not-dego","not dego",["lávvomuorran"]]],"text":"dego dego lávvomuorran"}
+{"errs":[["dego dego lávvomuorran",0,22,"syn-not-dego","blah",["lávvomuorran"],"not dego"]],"text":"dego dego lávvomuorran"}

test/suggest/expected.delete-span.json

@@ -1 +1 @@
-{"errs":[["dego … lávvomuorran",0,19,"syn-not-dego","not dego",["… lávvomuorran"]]],"text":"dego … lávvomuorran"}
+{"errs":[["dego … lávvomuorran",0,19,"syn-not-dego","blah",["… lávvomuorran"],"not dego"]],"text":"dego … lávvomuorran"}

test/suggest/expected.delete.json

@@ -1 +1 @@
-{"errs":[["dego lávvomuorran",0,17,"syn-not-dego","not dego",["lávvomuorran"]]],"text":"dego lávvomuorran"}
+{"errs":[["dego lávvomuorran",0,17,"syn-not-dego","blah",["lávvomuorran"],"not dego"]],"text":"dego lávvomuorran"}

test/suggest/expected.dollar2.json

@@ -1 +1 @@
-{"errs":[["fiinna",9,15,"syn-pred-not-attr-msg","«fiinna» ja «čáppa» leaba blah",["fiinnis"]]],"text":"čáppa ja fiinna.\n"}
+{"errs":[["fiinna",9,15,"syn-pred-not-attr-msg","Predicative, iige attributive – «fiinna» ja «čáppa» leaba blah",["fiinnis"],"«fiinna» ja «čáppa» leaba blah"]],"text":"čáppa ja fiinna.\n"}

test/suggest/expected.fiinna.err

@@ -1,2 +1,2 @@
-divvun-suggest: WARNING: No message for "syn-pred-not-attr" in xml:lang 'se', trying 'en'
-divvun-suggest: WARNING: No message for "syn-pred-not-attr" in any xml:lang
+divvun-suggest: WARNING: No <description> for "syn-pred-not-attr" in xml:lang 'se', trying 'en'
+divvun-suggest: WARNING: No <description> for "syn-pred-not-attr" in any xml:lang

test/suggest/expected.fiinna.json

@@ -1 +1 @@
-{"errs":[["fiinna",9,15,"syn-pred-not-attr","syn-pred-not-attr",["fiinnis"]]],"text":"čáppa ja fiinna.\n"}
+{"errs":[["fiinna",9,15,"syn-pred-not-attr","syn-pred-not-attr",["fiinnis"],"syn-pred-not-attr"]],"text":"čáppa ja fiinna.\n"}

test/suggest/expected.flushing.json

@@ -1 +1 @@
-{"errs":[["badjel",33,39,"lex-bokte-not-badjel","\"bokte\" iige \"badjel\"",["bokte"]]],"text":"sáddejuvvot báhpirat interneahta badjel.\n"}
+{"errs":[["badjel",33,39,"lex-bokte-not-badjel","boasttut sátni",["bokte"],"\"bokte\" iige \"badjel\""]],"text":"sáddejuvvot báhpirat interneahta badjel.\n"}

test/suggest/expected.html-in-msg.json

@@ -1 +1 @@
-{"errs":[["badjel",33,39,"msyn-valency-go-inf","Iskka<em>go</em>-oalgecealkaga iige infinitiiva",["bokte"]]],"text":"sáddejuvvot báhpirat interneahta badjel.\n"}
+{"errs":[["badjel",33,39,"msyn-valency-go-inf","<em>go</em> iige infinitiiva",["bokte"],"Iskka<em>go</em>-oalgecealkaga iige infinitiiva"]],"text":"sáddejuvvot báhpirat interneahta badjel.\n"}

test/suggest/expected.left-intervening.err

@@ -1,2 +1,2 @@
-divvun-suggest: WARNING: No message for "punct-rihkku-nosugg" in xml:lang 'se', trying 'en'
-divvun-suggest: WARNING: No message for "punct-rihkku-nosugg" in any xml:lang
+divvun-suggest: WARNING: No <description> for "punct-rihkku-nosugg" in xml:lang 'se', trying 'en'
+divvun-suggest: WARNING: No <description> for "punct-rihkku-nosugg" in any xml:lang

test/suggest/expected.left-intervening.json

@@ -1 +1 @@
-{"errs":[[", vel ja",34,42,"punct-rihkku-nosugg","punct-rihkku-nosugg",[]]],"text":"Otne leat sihke neahtta-bálvalusat, vel ja mobiila atnuprográmmat "}
+{"errs":[[", vel ja",34,42,"punct-rihkku-nosugg","punct-rihkku-nosugg",[],"punct-rihkku-nosugg"]],"text":"Otne leat sihke neahtta-bálvalusat, vel ja mobiila atnuprográmmat "}

test/suggest/expected.left-normspace.err

@@ -1,2 +1,2 @@
-divvun-suggest: WARNING: No message for "doublespace" in xml:lang 'se', trying 'en'
-divvun-suggest: WARNING: No message for "doublespace" in any xml:lang
+divvun-suggest: WARNING: No <description> for "doublespace" in xml:lang 'se', trying 'en'
+divvun-suggest: WARNING: No <description> for "doublespace" in any xml:lang

test/suggest/expected.left-normspace.json

@@ -1 +1 @@
-{"errs":[[",  vel  ja",34,44,"doublespace","doublespace",[", vel ja"]]],"text":"Otne leat sihke neahtta-bálvalusat,  vel  ja mobiila atnuprográmmat "}
+{"errs":[[",  vel  ja",34,44,"doublespace","doublespace",[", vel ja"],"doublespace"]],"text":"Otne leat sihke neahtta-bálvalusat,  vel  ja mobiila atnuprográmmat "}

test/suggest/expected.linebreaks.json

@@ -1 +1 @@
-{"errs":[["liegga riikii",14,27,"msyn-compound","Orru leahkime goallossátni",[]]],"text":"\ndon áibbašat liegga riikii.\n"}
+{"errs":[["liegga riikii",14,27,"msyn-compound","Orru leahkime goallossátni",[],"Orru leahkime goallossátni"]],"text":"\ndon áibbašat liegga riikii.\n"}

test/suggest/expected.relations.err

@@ -1,2 +1,2 @@
-divvun-suggest: WARNING: No message for "syn-Du3-not-Foc" in xml:lang 'se', trying 'en'
-divvun-suggest: WARNING: No message for "syn-Du3-not-Foc" in any xml:lang
+divvun-suggest: WARNING: No <description> for "syn-Du3-not-Foc" in xml:lang 'se', trying 'en'
+divvun-suggest: WARNING: No <description> for "syn-Du3-not-Foc" in any xml:lang

test/suggest/expected.relations.json

@@ -1 +1 @@
-{"errs":[["sáhti",0,5,"syn-Du3-not-Foc","syn-Du3-not-Foc",[]]],"text":"sáhtiba"}
+{"errs":[["sáhti",0,5,"syn-Du3-not-Foc","syn-Du3-not-Foc",[],"syn-Du3-not-Foc"]],"text":"sáhtiba"}

test/suggest/expected.same-as-form.json

@@ -1 +1 @@
-{"errs":[["badjel",33,39,"lex-bokte-not-badjel","\"bokte\" iige \"badjel\"",["bokte"]]],"text":"sáddejuvvot báhpirat interneahta badjel.\n"}
+{"errs":[["badjel",33,39,"lex-bokte-not-badjel","boasttut sátni",["bokte"],"\"bokte\" iige \"badjel\""]],"text":"sáddejuvvot báhpirat interneahta badjel.\n"}

test/suggest/expected.semroles.json

@@ -1 +1 @@
-{"errs":[["girjii",23,29,"real-girjji","Čállinmeattáhus",["girjje","girjji"]]],"text":"Lean oainnat lohkan 42 girjii, šuohkeha Line.\n"}
+{"errs":[["girjii",23,29,"real-girjji","Čállinmeattáhus",["girjje","girjji"],"Čállinmeattáhus"]],"text":"Lean oainnat lohkan 42 girjii, šuohkeha Line.\n"}

test/suggest/expected.subreadings.json

@@ -1 +1 @@
-{"errs":[["Eallámušvallji",0,14,"msyn-compound","Orru leahkime goallossátni",["eallámušvalljái"]]],"text":"Eallámušvallji\n"}
+{"errs":[["Eallámušvallji",0,14,"msyn-compound","Orru leahkime goallossátni",["eallámušvalljái"],"Orru leahkime goallossátni"]],"text":"Eallámušvallji\n"}

test/suggest/expected.suggestwf-spaces.err

@@ -1,2 +1,2 @@
-divvun-suggest: WARNING: No message for "typo" in xml:lang 'se', trying 'en'
-divvun-suggest: WARNING: No message for "typo" in any xml:lang
+divvun-suggest: WARNING: No <description> for "typo" in xml:lang 'se', trying 'en'
+divvun-suggest: WARNING: No <description> for "typo" in any xml:lang

test/suggest/expected.suggestwf-spaces.json

@@ -1 +1 @@
-{"errs":[["davasguvlui",0,11,"typo","typo",["davás guvlui","darvasgovlui","davrasgovlui","eavasgovlui","daŋasgovlui"]]],"text":"davasguvlui\n"}
+{"errs":[["davasguvlui",0,11,"typo","typo",["davás guvlui","darvasgovlui","davrasgovlui","eavasgovlui","daŋasgovlui"],"typo"]],"text":"davasguvlui\n"}

test/suggest/expected.superblanks.err

@@ -1,2 +1,2 @@
-divvun-suggest: WARNING: No message for "syn-Du3-not-Foc" in xml:lang 'se', trying 'en'
-divvun-suggest: WARNING: No message for "syn-Du3-not-Foc" in any xml:lang
+divvun-suggest: WARNING: No <description> for "syn-Du3-not-Foc" in xml:lang 'se', trying 'en'
+divvun-suggest: WARNING: No <description> for "syn-Du3-not-Foc" in any xml:lang

test/suggest/expected.superblanks.json

@@ -1 +1 @@
-{"errs":[["sáhti",6,11,"syn-Du3-not-Foc","syn-Du3-not-Foc",[]]],"text":"\n<br/>sáhti<em>{}[]</em>ba\n"}
+{"errs":[["sáhti",6,11,"syn-Du3-not-Foc","syn-Du3-not-Foc",[],"syn-Du3-not-Foc"]],"text":"\n<br/>sáhti<em>{}[]</em>ba\n"}

test/suggest/expected.utf16.json

@@ -1 +1 @@
-{"errs":[["badjel",37,43,"lex-bokte-not-badjel","\"bokte\" iige \"badjel\"",["bokte"]]],"text":"🇳🇴sáddejuvvot báhpirat interneahta badjel.\n"}
+{"errs":[["badjel",37,43,"lex-bokte-not-badjel","boasttut sátni",["bokte"],"\"bokte\" iige \"badjel\""]],"text":"🇳🇴sáddejuvvot báhpirat interneahta badjel.\n"}