From 9a3a8d1915c8a3666984d6603606af856dfd8c41 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Mon, 26 Jun 2017 22:23:43 +0300 Subject: Add support for regex function family --- unit-tests/cc/lexer/buildfile | 9 +++++---- unit-tests/cc/parser/buildfile | 2 +- unit-tests/function/buildfile | 6 +++--- unit-tests/lexer/buildfile | 6 +++--- unit-tests/scheduler/buildfile | 6 +++--- unit-tests/test/script/lexer/buildfile | 10 ++++++---- unit-tests/test/script/parser/buildfile | 12 +++++++----- 7 files changed, 28 insertions(+), 23 deletions(-) (limited to 'unit-tests') diff --git a/unit-tests/cc/lexer/buildfile b/unit-tests/cc/lexer/buildfile index 3152e77..53adc33 100644 --- a/unit-tests/cc/lexer/buildfile +++ b/unit-tests/cc/lexer/buildfile @@ -5,11 +5,12 @@ #@@ Temporary until we get utility library support. # import libs = libbutl%lib{butl} -src = cc/lexer token lexer diagnostics utility variable name b-options \ +src = cc/lexer token lexer diagnostics utility variable name b-options \ types-parsers context scope parser target operation rule prerequisite file \ -module function functions-builtin functions-filesystem functions-path \ -functions-process-path functions-string functions-target-triplet algorithm \ -search dump filesystem scheduler config/{utility init operation module} spec +module function functions-builtin functions-filesystem functions-path \ +functions-process-path functions-regex functions-string \ +functions-target-triplet algorithm search dump filesystem scheduler \ +config/{utility init operation module} spec exe{driver}: cxx{driver} ../../../build2/cxx{$src} ../../../build2/liba{b} \ $libs test{*} diff --git a/unit-tests/cc/parser/buildfile b/unit-tests/cc/parser/buildfile index bb1ad53..59ef4fa 100644 --- a/unit-tests/cc/parser/buildfile +++ b/unit-tests/cc/parser/buildfile @@ -8,7 +8,7 @@ import libs = libbutl%lib{butl} src = cc/{lexer parser} token lexer diagnostics utility variable name \ b-options types-parsers context scope parser target operation rule \ prerequisite file module function functions-builtin functions-filesystem \ -functions-path functions-process-path functions-string \ +functions-path functions-process-path functions-regex functions-string \ functions-target-triplet algorithm search dump filesystem scheduler \ config/{utility init operation module} spec diff --git a/unit-tests/function/buildfile b/unit-tests/function/buildfile index c0cd26f..ad29ac7 100644 --- a/unit-tests/function/buildfile +++ b/unit-tests/function/buildfile @@ -5,11 +5,11 @@ #@@ Temporary until we get utility library support. # import libs = libbutl%lib{butl} -src = token lexer diagnostics utility variable name b-options types-parsers \ +src = token lexer diagnostics utility variable name b-options types-parsers \ context scope parser target operation rule prerequisite file module function \ functions-builtin functions-filesystem functions-path functions-process-path \ -functions-string functions-target-triplet algorithm search dump filesystem \ -scheduler config/{utility init operation module} spec +functions-regex functions-string functions-target-triplet algorithm search \ +dump filesystem scheduler config/{utility init operation module} spec exe{driver}: cxx{driver} ../../build2/cxx{$src} ../../build2/liba{b} $libs test{call syntax} diff --git a/unit-tests/lexer/buildfile b/unit-tests/lexer/buildfile index 3d4e3ed..0ab50de 100644 --- a/unit-tests/lexer/buildfile +++ b/unit-tests/lexer/buildfile @@ -5,11 +5,11 @@ #@@ Temporary until we get utility library support. # import libs = libbutl%lib{butl} -src = token lexer diagnostics utility variable name b-options types-parsers \ +src = token lexer diagnostics utility variable name b-options types-parsers \ context scope parser target operation rule prerequisite file module function \ functions-builtin functions-filesystem functions-path functions-process-path \ -functions-string functions-target-triplet algorithm search dump filesystem \ -scheduler config/{utility init operation module} spec +functions-regex functions-string functions-target-triplet algorithm search \ +dump filesystem scheduler config/{utility init operation module} spec exe{driver}: cxx{driver} ../../build2/cxx{$src} ../../build2/liba{b} $libs \ test{*} diff --git a/unit-tests/scheduler/buildfile b/unit-tests/scheduler/buildfile index 22361b5..b3b97ce 100644 --- a/unit-tests/scheduler/buildfile +++ b/unit-tests/scheduler/buildfile @@ -5,11 +5,11 @@ #@@ Temporary until we get utility library support. # import libs = libbutl%lib{butl} -src = token lexer diagnostics utility variable name b-options types-parsers \ +src = token lexer diagnostics utility variable name b-options types-parsers \ context scope parser target operation rule prerequisite file module function \ functions-builtin functions-filesystem functions-path functions-process-path \ -functions-string functions-target-triplet algorithm search dump filesystem \ -scheduler config/{utility init operation module} spec +functions-regex functions-string functions-target-triplet algorithm search \ +dump filesystem scheduler config/{utility init operation module} spec exe{driver}: cxx{driver} ../../build2/cxx{$src} ../../build2/liba{b} $libs diff --git a/unit-tests/test/script/lexer/buildfile b/unit-tests/test/script/lexer/buildfile index 2070089..a21df7a 100644 --- a/unit-tests/test/script/lexer/buildfile +++ b/unit-tests/test/script/lexer/buildfile @@ -5,13 +5,15 @@ #@@ Temporary until we get utility library support. # import libs = libbutl%lib{butl} -src = token lexer diagnostics utility variable name b-options types-parsers \ +src = token lexer diagnostics utility variable name b-options types-parsers \ context scope parser target operation rule prerequisite file module function \ functions-builtin functions-filesystem functions-path functions-process-path \ -functions-string functions-target-triplet algorithm search dump filesystem \ -scheduler config/{utility init operation module} test/script/{token lexer} spec +functions-regex functions-string functions-target-triplet algorithm search \ +dump filesystem scheduler config/{utility init operation module} \ +test/script/{token lexer} spec -exe{driver}: cxx{driver} ../../../../build2/cxx{$src} ../../../../build2/liba{b} $libs \ +exe{driver}: cxx{driver} ../../../../build2/cxx{$src} \ +../../../../build2/liba{b} $libs \ test{command-line first-token second-token command-expansion variable-line \ description-line variable} diff --git a/unit-tests/test/script/parser/buildfile b/unit-tests/test/script/parser/buildfile index 634120c..184fd82 100644 --- a/unit-tests/test/script/parser/buildfile +++ b/unit-tests/test/script/parser/buildfile @@ -8,12 +8,14 @@ import libs = libbutl%lib{butl} src = token lexer parser diagnostics utility variable name context target \ scope prerequisite file module operation rule b-options algorithm search \ filesystem function functions-builtin functions-filesystem functions-path \ -functions-process-path functions-string functions-target-triplet \ -config/{utility init operation module} dump types-parsers \ -test/{target script/{token lexer parser regex script}} scheduler spec +functions-process-path functions-regex functions-string \ +functions-target-triplet config/{utility init operation module} dump \ +types-parsers test/{target script/{token lexer parser regex script}} \ +scheduler spec -exe{driver}: cxx{driver} ../../../../build2/cxx{$src} ../../../../build2/liba{b} $libs \ -test{cleanup command-if command-re-parse description directive exit \ +exe{driver}: cxx{driver} ../../../../build2/cxx{$src} \ +../../../../build2/liba{b} $libs \ +test{cleanup command-if command-re-parse description directive exit \ expansion here-document here-string include pipe-expr pre-parse \ redirect regex scope scope-if setup-teardown} -- cgit v1.1