From 04670dbf9177590b28f4c7d2443932cc1f7c0b2b Mon Sep 17 00:00:00 2001 From: Carl Philipp Klemm <philipp@uvos.xyz> Date: Tue, 2 Aug 2022 10:12:54 +0200 Subject: [PATCH] rename tokenize to strops --- CMakeLists.txt | 2 +- cap.cpp | 2 +- constantphase.cpp | 2 +- finitetr.cpp | 2 +- inductor.cpp | 2 +- model.cpp | 2 +- options.h | 2 +- resistor.cpp | 2 +- tokenize.cpp => strops.cpp | 2 +- tokenize.h => strops.h | 0 warburg.cpp | 2 +- 11 files changed, 10 insertions(+), 10 deletions(-) rename tokenize.cpp => strops.cpp (96%) rename tokenize.h => strops.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index c90e725..0ddd553 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,6 @@ set(SRC_FILES constantphase.cpp warburg.cpp model.cpp - tokenize.cpp paralellseriel.cpp log.cpp normalize.cpp @@ -20,6 +19,7 @@ set(SRC_FILES basicmath.cpp finitetr.cpp eistype.cpp + strops.cpp ) set(API_HEADERS_CPP_DIR eisgenerator/) diff --git a/cap.cpp b/cap.cpp index 19933dd..833883f 100644 --- a/cap.cpp +++ b/cap.cpp @@ -1,5 +1,5 @@ #include "cap.h" -#include "tokenize.h" +#include "strops.h" #include <cstdlib> #include <math.h> diff --git a/constantphase.cpp b/constantphase.cpp index f83bba4..127b96e 100644 --- a/constantphase.cpp +++ b/constantphase.cpp @@ -1,5 +1,5 @@ #include "constantphase.h" -#include "tokenize.h" +#include "strops.h" #include <cstdlib> #define _USE_MATH_DEFINES #include <cmath> diff --git a/finitetr.cpp b/finitetr.cpp index 2572744..726558a 100644 --- a/finitetr.cpp +++ b/finitetr.cpp @@ -9,7 +9,7 @@ #include "cap.h" #include "resistor.h" #include "log.h" -#include "tokenize.h" +#include "strops.h" using namespace eis; diff --git a/inductor.cpp b/inductor.cpp index 195a78a..1d0a656 100644 --- a/inductor.cpp +++ b/inductor.cpp @@ -1,5 +1,5 @@ #include "inductor.h" -#include "tokenize.h" +#include "strops.h" #include <cstdlib> #include <math.h> diff --git a/model.cpp b/model.cpp index 61fb6ba..72430bf 100644 --- a/model.cpp +++ b/model.cpp @@ -3,7 +3,7 @@ #include <iostream> #include <assert.h> #include <vector> -#include "tokenize.h" +#include "strops.h" #include "cap.h" #include "resistor.h" #include "inductor.h" diff --git a/options.h b/options.h index f59e237..ba3f55e 100644 --- a/options.h +++ b/options.h @@ -4,7 +4,7 @@ #include <argp.h> #include "model.h" #include "log.h" -#include "tokenize.h" +#include "strops.h" const char *argp_program_version = "eisgenerator-1.0"; const char *argp_program_bug_address = "<carl@uvos.xyz>"; diff --git a/resistor.cpp b/resistor.cpp index c83b9e2..8784285 100644 --- a/resistor.cpp +++ b/resistor.cpp @@ -1,5 +1,5 @@ #include "resistor.h" -#include "tokenize.h" +#include "strops.h" #include <vector> #include <math.h> diff --git a/tokenize.cpp b/strops.cpp similarity index 96% rename from tokenize.cpp rename to strops.cpp index b752e8c..ab8e22c 100644 --- a/tokenize.cpp +++ b/strops.cpp @@ -1,4 +1,4 @@ -#include "tokenize.h" +#include "strops.h" std::vector<std::string> tokenize(const std::string& str, const char delim, const char ignBracketStart, const char ignBracketEnd, const char escapeChar) { diff --git a/tokenize.h b/strops.h similarity index 100% rename from tokenize.h rename to strops.h diff --git a/warburg.cpp b/warburg.cpp index c4e30f2..76aa7df 100644 --- a/warburg.cpp +++ b/warburg.cpp @@ -1,5 +1,5 @@ #include "warburg.h" -#include "tokenize.h" +#include "strops.h" #include <cstdlib> #include <math.h> -- GitLab