From 24d1e7ec7ee324f93e420d933c02b6bb98853378 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Sat, 3 Nov 2018 23:18:24 -0700 Subject: [PATCH] Included embedded-template parser in randomized tests --- script/fetch-fixtures | 21 +++++++++++---------- script/fetch-fixtures.cmd | 21 +++++++++++---------- test/helpers/load_language.cc | 14 +++++++++++++- test/integration/real_grammars.cc | 1 + 4 files changed, 36 insertions(+), 21 deletions(-) diff --git a/script/fetch-fixtures b/script/fetch-fixtures index 4923e62c..a298a4d0 100755 --- a/script/fetch-fixtures +++ b/script/fetch-fixtures @@ -21,13 +21,14 @@ fetch_grammar() { ) } -fetch_grammar javascript master -fetch_grammar json master -fetch_grammar c master -fetch_grammar cpp master -fetch_grammar python master -fetch_grammar go master -fetch_grammar ruby master -fetch_grammar typescript master -fetch_grammar bash master -fetch_grammar html master +fetch_grammar embedded-template master +fetch_grammar javascript master +fetch_grammar json master +fetch_grammar c master +fetch_grammar cpp master +fetch_grammar python master +fetch_grammar go master +fetch_grammar ruby master +fetch_grammar typescript master +fetch_grammar bash master +fetch_grammar html master diff --git a/script/fetch-fixtures.cmd b/script/fetch-fixtures.cmd index 17ff224d..0e65b0a0 100644 --- a/script/fetch-fixtures.cmd +++ b/script/fetch-fixtures.cmd @@ -1,15 +1,16 @@ @echo off -call:fetch_grammar javascript master -call:fetch_grammar json master -call:fetch_grammar c master -call:fetch_grammar cpp master -call:fetch_grammar python master -call:fetch_grammar go master -call:fetch_grammar ruby master -call:fetch_grammar typescript master -call:fetch_grammar bash master -call:fetch_grammar html master +call:fetch_grammar embedded-template master +call:fetch_grammar javascript master +call:fetch_grammar json master +call:fetch_grammar c master +call:fetch_grammar cpp master +call:fetch_grammar python master +call:fetch_grammar go master +call:fetch_grammar ruby master +call:fetch_grammar typescript master +call:fetch_grammar bash master +call:fetch_grammar html master EXIT /B 0 :fetch_grammar diff --git a/test/helpers/load_language.cc b/test/helpers/load_language.cc index efec4371..c4bb982c 100644 --- a/test/helpers/load_language.cc +++ b/test/helpers/load_language.cc @@ -20,6 +20,18 @@ map loaded_languages; int libcompiler_mtime = -1; int compile_result_count = 0; +string get_language_function_name(string language_name) { + string result = "tree_sitter_"; + for (auto c : language_name) { + if (c == '-') { + result += '_'; + } else { + result += c; + } + } + return result; +} + #ifdef _WIN32 #include @@ -145,7 +157,7 @@ static const TSLanguage *load_language(const string &source_filename, const string &lib_filename, const string &language_name, string external_scanner_filename = "") { - string language_function_name = "tree_sitter_" + language_name; + string language_function_name = get_language_function_name(language_name); string header_dir = join_path({get_cwd(), "include"}); int source_mtime = get_modified_time(source_filename); int header_mtime = get_modified_time(join_path({header_dir, "tree_sitter", "parser.h"})); diff --git a/test/integration/real_grammars.cc b/test/integration/real_grammars.cc index 6c951168..556ddf44 100644 --- a/test/integration/real_grammars.cc +++ b/test/integration/real_grammars.cc @@ -16,6 +16,7 @@ START_TEST; if (TREE_SITTER_SEED == -1) return; vector test_languages({ + "embedded-template", "javascript", "json", "html",