Merge with master

Author: aslakhellesoy

.gitrepo

@@ -0,0 +1 @@
+cucumber/gherkin-c.git

.subrepo

@@ -67,7 +67,7 @@ libs_so: ./include/rule_type.h src/parser.c src/dialect.c $(SRC_FILES) src/Makef
 	# have mono, so we'll allow this line to fail.
 	-mono berp/berp.exe -g gherkin.berp -t gherkin-c-rule-type.razor -o $@
 	# Remove BOM
-	sed '1s/^\xEF\xBB\xBF//' < $@ > $@.nobom
+	awk 'NR==1{sub(/^\xef\xbb\xbf/,"")}{print}' < $@ > $@.nobom
 	mv $@.nobom $@
 
 src/parser.c: gherkin.berp gherkin-c-parser.razor
@@ -77,7 +77,7 @@ src/parser.c: gherkin.berp gherkin-c-parser.razor
 	# have mono, so we'll allow this line to fail.
 	-mono berp/berp.exe -g gherkin.berp -t gherkin-c-parser.razor -o $@
 	# Remove BOM
-	sed '1s/^\xEF\xBB\xBF//' < $@ > $@.nobom
+	awk 'NR==1{sub(/^\xef\xbb\xbf/,"")}{print}' < $@ > $@.nobom
 	mv $@.nobom $@
 
 src/dialect.c: gherkin-languages.json dialect.c.jq

Makefile

@@ -574,8 +574,7 @@
       "Und "
     ],
     "background": [
-      "Grundlage",
-      "Hintergrund"
+      "Grundlage"
     ],
     "but": [
       "* ",
@@ -600,10 +599,8 @@
       "Szenario"
     ],
     "scenarioOutline": [
-      "Beispielvorlage",
-      "Szenariovorlage",
-      "Beispielgrundlage",
-      "Szenariogrundlage"
+      "Beispielrundriss",
+      "Szenariogrundriss"
     ],
     "then": [
       "* ",
@@ -2516,8 +2513,7 @@
       "* ",
       "Допустим ",
       "Дано ",
-      "Пусть ",
-      "Если "
+      "Пусть "
     ],
     "name": "Russian",
     "native": "русский",
@@ -2536,7 +2532,8 @@
     ],
     "when": [
       "* ",
-      "Когда "
+      "Когда ",
+      "Если "
     ]
   },
   "sk": {

gherkin-languages.json

@@ -1,30 +1,28 @@
 [
-	Tokens -> #Empty,#Comment,#TagLine,#FeatureLine,#BackgroundLine,#ScenarioLine,#ScenarioOutlineLine,#ExamplesLine,#StepLine,#DocStringSeparator,#TableRow,#Language
+	Tokens -> #Empty,#Comment,#TagLine,#FeatureLine,#BackgroundLine,#ScenarioLine,#ExamplesLine,#StepLine,#DocStringSeparator,#TableRow,#Language
 	IgnoredTokens -> #Comment,#Empty
 	ClassName -> Parser
 	Namespace -> Gherkin
 ]
 
 GherkinDocument! := Feature?
-Feature! := Feature_Header Background? Scenario_Definition*
-Feature_Header! := #Language? Tags? #FeatureLine Description_Helper
+Feature! := FeatureHeader Background? ScenarioDefinition*
+FeatureHeader! := #Language? Tags? #FeatureLine DescriptionHelper
 
-Background! := #BackgroundLine Description_Helper Step*
+Background! := #BackgroundLine DescriptionHelper Step*
 
-// we could avoid defining Scenario_Definition, but that would require regular look-aheads, so worse performance
-Scenario_Definition! := Tags? (Scenario | ScenarioOutline)
+// we could avoid defining ScenarioDefinition, but that would require regular look-aheads, so worse performance
+ScenarioDefinition! := Tags? Scenario
 
-Scenario! := #ScenarioLine Description_Helper Step*
-
-ScenarioOutline! := #ScenarioOutlineLine Description_Helper Step* Examples_Definition*
-// after the first "Examples" block, interpreting a tag line is ambiguous (tagline of next examples or of next scenario)
+Scenario! := #ScenarioLine DescriptionHelper Step* ExamplesDefinition*
+// after the first "Data" block, interpreting a tag line is ambiguous (tagline of next examples or of next scenario)
 // because of this, we need a lookahead hint, that connects the tag line to the next examples, if there is an examples block ahead
-Examples_Definition! [#Empty|#Comment|#TagLine->#ExamplesLine]:= Tags? Examples
-Examples! := #ExamplesLine Description_Helper Examples_Table?
-Examples_Table! := #TableRow #TableRow*
+ExamplesDefinition! [#Empty|#Comment|#TagLine->#ExamplesLine]:= Tags? Examples
+Examples! := #ExamplesLine DescriptionHelper ExamplesTable?
+ExamplesTable! := #TableRow #TableRow*
 
-Step! := #StepLine Step_Arg?
-Step_Arg := (DataTable | DocString)
+Step! := #StepLine StepArg?
+StepArg := (DataTable | DocString)
 
 DataTable! := #TableRow+
 DocString! := #DocStringSeparator #Other* #DocStringSeparator
@@ -33,5 +31,5 @@ Tags! := #TagLine+
 
 // we need to explicitly mention comment, to avoid merging it into the description line's #Other token
 // we also eat the leading empty lines, the tailing lines are not removed by the parser to avoid lookahead, this has to be done by the AST builder
-Description_Helper := #Empty* Description? #Comment*
+DescriptionHelper := #Empty* Description? #Comment*
 Description! := #Other+

gherkin.berp

@@ -2423,8 +2423,8 @@ static const Keywords ru_examples_keywords = { 1, ru_examples_KEYWORDS };
 static const wchar_t* const ru_feature_KEYWORDS[] = { L"Функция", L"Функциональность", L"Функционал", L"Свойство" };
 static const Keywords ru_feature_keywords = { 4, ru_feature_KEYWORDS };
 
-static const wchar_t* const ru_given_KEYWORDS[] = { L"* ", L"Допустим ", L"Дано ", L"Пусть ", L"Если " };
-static const Keywords ru_given_keywords = { 5, ru_given_KEYWORDS };
+static const wchar_t* const ru_given_KEYWORDS[] = { L"* ", L"Допустим ", L"Дано ", L"Пусть " };
+static const Keywords ru_given_keywords = { 4, ru_given_KEYWORDS };
 
 static const wchar_t* const ru_scenario_KEYWORDS[] = { L"Пример", L"Сценарий" };
 static const Keywords ru_scenario_keywords = { 2, ru_scenario_KEYWORDS };
@@ -2435,8 +2435,8 @@ static const Keywords ru_scenarioOutline_keywords = { 1, ru_scenarioOutline_KEYW
 static const wchar_t* const ru_then_KEYWORDS[] = { L"* ", L"То ", L"Затем ", L"Тогда " };
 static const Keywords ru_then_keywords = { 4, ru_then_KEYWORDS };
 
-static const wchar_t* const ru_when_KEYWORDS[] = { L"* ", L"Когда " };
-static const Keywords ru_when_keywords = { 2, ru_when_KEYWORDS };
+static const wchar_t* const ru_when_KEYWORDS[] = { L"* ", L"Когда ", L"Если " };
+static const Keywords ru_when_keywords = { 3, ru_when_KEYWORDS };
 
 static const Dialect ru_dialect = {
         L"ru",

src/dialect.c

@@ -21,7 +21,14 @@ const wchar_t* FileReader_read(FileReader* file_reader) {
     int pos = 0;
     long code_point;
     FILE* file = fopen(file_reader->file_name, "rb");
+
+    if(file == NULL) {
+      swprintf(buffer, sizeof(wchar_t), L"%c", ' ');
+      return buffer;
+    }
+
     Utf8Source* utf8_source = FileUtf8Source_new(file);
+
     do {
         code_point = UnicodeUtilities_read_code_point_from_utf8_source(utf8_source);
         if (code_point != WEOF) {

src/file_reader.c

@@ -1,2 +1,2 @@
 {"data":"(2:1): expected: #EOF, #Language, #TagLine, #FeatureLine, #Comment, #Empty, got 'invalid line here'","media":{"encoding":"utf-8","type":"text/x.cucumber.stacktrace+plain"},"source":{"start":{"column":1,"line":2},"uri":"testdata/bad/multiple_parser_errors.feature"},"type":"attachment"}
-{"data":"(9:1): expected: #EOF, #TableRow, #DocStringSeparator, #StepLine, #TagLine, #ScenarioLine, #ScenarioOutlineLine, #Comment, #Empty, got 'another invalid line here'","media":{"encoding":"utf-8","type":"text/x.cucumber.stacktrace+plain"},"source":{"start":{"column":1,"line":9},"uri":"testdata/bad/multiple_parser_errors.feature"},"type":"attachment"}
+{"data":"(9:1): expected: #EOF, #TableRow, #DocStringSeparator, #StepLine, #TagLine, #ExamplesLine, #ScenarioLine, #Comment, #Empty, got 'another invalid line here'","media":{"encoding":"utf-8","type":"text/x.cucumber.stacktrace+plain"},"source":{"start":{"column":1,"line":9},"uri":"testdata/bad/multiple_parser_errors.feature"},"type":"attachment"}

testdata/bad/multiple_parser_errors.feature.errors.ndjson

@@ -1 +1 @@
-{"data":"(7:0): unexpected end of file, expected: #TagLine, #ScenarioLine, #ScenarioOutlineLine, #Comment, #Empty","media":{"encoding":"utf-8","type":"text/x.cucumber.stacktrace+plain"},"source":{"start":{"column":0,"line":7},"uri":"testdata/bad/unexpected_eof.feature"},"type":"attachment"}
+{"data":"(7:0): unexpected end of file, expected: #TagLine, #ScenarioLine, #Comment, #Empty","media":{"encoding":"utf-8","type":"text/x.cucumber.stacktrace+plain"},"source":{"start":{"column":0,"line":7},"uri":"testdata/bad/unexpected_eof.feature"},"type":"attachment"}

testdata/bad/unexpected_eof.feature.errors.ndjson

@@ -1 +1 @@
-{"document":{"comments":[],"feature":{"children":[{"keyword":"Background","location":{"column":3,"line":3},"name":"a simple background","steps":[{"keyword":"Given ","location":{"column":5,"line":4},"text":"the minimalism inside a background","type":"Step"}],"type":"Background"},{"keyword":"Scenario","location":{"column":3,"line":7},"name":"minimalistic","steps":[{"keyword":"Given ","location":{"column":5,"line":8},"text":"the minimalism","type":"Step"}],"tags":[],"type":"Scenario"}],"keyword":"Feature","language":"en","location":{"column":1,"line":1},"name":"Background","tags":[],"type":"Feature"},"type":"GherkinDocument"},"type":"gherkin-document","uri":"testdata/good/background.feature"}
+{"document":{"comments":[],"feature":{"children":[{"keyword":"Background","location":{"column":3,"line":3},"name":"a simple background","steps":[{"keyword":"Given ","location":{"column":5,"line":4},"text":"the minimalism inside a background","type":"Step"}],"type":"Background"},{"examples":[],"keyword":"Scenario","location":{"column":3,"line":7},"name":"minimalistic","steps":[{"keyword":"Given ","location":{"column":5,"line":8},"text":"the minimalism","type":"Step"}],"tags":[],"type":"Scenario"}],"keyword":"Feature","language":"en","location":{"column":1,"line":1},"name":"Background","tags":[],"type":"Feature"},"type":"GherkinDocument"},"type":"gherkin-document","uri":"testdata/good/background.feature"}