From e8ae407c0f1934b0999ba4af2ff6558028c1c036 Mon Sep 17 00:00:00 2001 From: Witold Filipczyk Date: Mon, 25 Oct 2021 17:31:05 +0200 Subject: [PATCH] [ecmascript] Moved css2xpath --- src/ecmascript/Makefile | 2 +- src/ecmascript/{spidermonkey => }/css2xpath.c | 2 +- src/ecmascript/css2xpath.h | 8 ++++++++ src/ecmascript/meson.build | 2 +- src/ecmascript/spidermonkey/Makefile | 2 +- src/ecmascript/spidermonkey/css2xpath.h | 8 -------- src/ecmascript/spidermonkey/document.c | 2 +- src/ecmascript/spidermonkey/element.c | 2 +- src/ecmascript/spidermonkey/meson.build | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) rename src/ecmascript/{spidermonkey => }/css2xpath.c (99%) create mode 100644 src/ecmascript/css2xpath.h delete mode 100644 src/ecmascript/spidermonkey/css2xpath.h diff --git a/src/ecmascript/Makefile b/src/ecmascript/Makefile index 69cb11227..ce4b2c1f4 100644 --- a/src/ecmascript/Makefile +++ b/src/ecmascript/Makefile @@ -4,7 +4,7 @@ INCLUDES += $(SPIDERMONKEY_CFLAGS) SUBDIRS-$(CONFIG_ECMASCRIPT_SMJS) += spidermonkey -OBJS-$(CONFIG_ECMASCRIPT_SMJS) += ecmascript.o spidermonkey.o +OBJS-$(CONFIG_ECMASCRIPT_SMJS) += css2xpath.o ecmascript.o spidermonkey.o ifeq ($(CONFIG_ECMASCRIPT_SMJS), yes) CONFIG_ANY_SPIDERMONKEY = yes diff --git a/src/ecmascript/spidermonkey/css2xpath.c b/src/ecmascript/css2xpath.c similarity index 99% rename from src/ecmascript/spidermonkey/css2xpath.c rename to src/ecmascript/css2xpath.c index 868fc0868..1cbc95cba 100644 --- a/src/ecmascript/spidermonkey/css2xpath.c +++ b/src/ecmascript/css2xpath.c @@ -15,7 +15,7 @@ #include #include -#include "ecmascript/spidermonkey/css2xpath.h" +#include "ecmascript/css2xpath.h" namespace std { diff --git a/src/ecmascript/css2xpath.h b/src/ecmascript/css2xpath.h new file mode 100644 index 000000000..7560d1702 --- /dev/null +++ b/src/ecmascript/css2xpath.h @@ -0,0 +1,8 @@ +#ifndef EL__ECMASCRIPT_CSS2XPATH_H +#define EL__ECMASCRIPT_CSS2XPATH_H + +#include + +std::string css2xpath(std::string &selector); + +#endif diff --git a/src/ecmascript/meson.build b/src/ecmascript/meson.build index 63d4d50c2..87b52f87c 100644 --- a/src/ecmascript/meson.build +++ b/src/ecmascript/meson.build @@ -1,7 +1,7 @@ #INCLUDES += $(SPIDERMONKEY_CFLAGS) if conf_data.get('CONFIG_ECMASCRIPT_SMJS') subdir('spidermonkey') - srcs += files('ecmascript.c', 'spidermonkey.c') + srcs += files('css2xpath.c', 'ecmascript.c', 'spidermonkey.c') endif if conf_data.get('CONFIG_ECMASCRIPT_SMJS') diff --git a/src/ecmascript/spidermonkey/Makefile b/src/ecmascript/spidermonkey/Makefile index 3bb5bcb44..535d6260e 100644 --- a/src/ecmascript/spidermonkey/Makefile +++ b/src/ecmascript/spidermonkey/Makefile @@ -2,7 +2,7 @@ top_builddir=../../.. include $(top_builddir)/Makefile.config INCLUDES += $(SPIDERMONKEY_CFLAGS) -OBJS = attr.o attributes.o collection.o console.o css2xpath.o document.o element.o form.o heartbeat.o history.o implementation.o \ +OBJS = attr.o attributes.o collection.o console.o document.o element.o form.o heartbeat.o history.o implementation.o \ location.o localstorage.o localstorage-db.o navigator.o nodelist.o screen.o unibar.o window.o include $(top_srcdir)/Makefile.lib diff --git a/src/ecmascript/spidermonkey/css2xpath.h b/src/ecmascript/spidermonkey/css2xpath.h deleted file mode 100644 index bcaaa7242..000000000 --- a/src/ecmascript/spidermonkey/css2xpath.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef EL__ECMASCRIPT_SPIDERMONKEY_CSS2XPATH_H -#define EL__ECMASCRIPT_SPIDERMONKEY_CSS2XPATH_H - -#include - -std::string css2xpath(std::string &selector); - -#endif diff --git a/src/ecmascript/spidermonkey/document.c b/src/ecmascript/spidermonkey/document.c index 78afd49c2..e2a312b75 100644 --- a/src/ecmascript/spidermonkey/document.c +++ b/src/ecmascript/spidermonkey/document.c @@ -23,9 +23,9 @@ #include "document/document.h" #include "document/forms.h" #include "document/view.h" +#include "ecmascript/css2xpath.h" #include "ecmascript/ecmascript.h" #include "ecmascript/spidermonkey/collection.h" -#include "ecmascript/spidermonkey/css2xpath.h" #include "ecmascript/spidermonkey/form.h" #include "ecmascript/spidermonkey/implementation.h" #include "ecmascript/spidermonkey/location.h" diff --git a/src/ecmascript/spidermonkey/element.c b/src/ecmascript/spidermonkey/element.c index 193ba0ab2..b6554ff5c 100644 --- a/src/ecmascript/spidermonkey/element.c +++ b/src/ecmascript/spidermonkey/element.c @@ -22,11 +22,11 @@ #include "document/document.h" #include "document/forms.h" #include "document/view.h" +#include "ecmascript/css2xpath.h" #include "ecmascript/ecmascript.h" #include "ecmascript/spidermonkey/attr.h" #include "ecmascript/spidermonkey/attributes.h" #include "ecmascript/spidermonkey/collection.h" -#include "ecmascript/spidermonkey/css2xpath.h" #include "ecmascript/spidermonkey/element.h" #include "ecmascript/spidermonkey/nodelist.h" #include "ecmascript/spidermonkey/window.h" diff --git a/src/ecmascript/spidermonkey/meson.build b/src/ecmascript/spidermonkey/meson.build index e63e355ff..8c0cdaa78 100644 --- a/src/ecmascript/spidermonkey/meson.build +++ b/src/ecmascript/spidermonkey/meson.build @@ -1,3 +1,3 @@ #INCLUDES += $(SPIDERMONKEY_CFLAGS) -srcs += files('attr.c', 'attributes.c', 'collection.c', 'console.c', 'css2xpath.c', 'document.c', 'element.c', 'form.c', 'heartbeat.c', 'history.c', 'implementation.c', 'location.c', 'localstorage.c', 'localstorage-db.c', 'navigator.c', 'nodelist.c', 'screen.c', 'unibar.c', 'window.c') +srcs += files('attr.c', 'attributes.c', 'collection.c', 'console.c', 'document.c', 'element.c', 'form.c', 'heartbeat.c', 'history.c', 'implementation.c', 'location.c', 'localstorage.c', 'localstorage-db.c', 'navigator.c', 'nodelist.c', 'screen.c', 'unibar.c', 'window.c')