From 70ee584c653c76780b85f7c632e103b0b966c7a8 Mon Sep 17 00:00:00 2001
From: SimonFJ20 <simonfromjakobsen@gmail.com>
Date: Fri, 13 Jan 2023 13:51:09 +0100
Subject: [PATCH] moved markup and scriptlang inside browser

---
 {markup => browser/markup}/lexer.cpp           | 0
 {markup => browser/markup}/lexer.hpp           | 0
 {markup => browser/markup}/meson.build         | 2 +-
 {markup => browser/markup}/parser.cpp          | 0
 {markup => browser/markup}/parser.hpp          | 0
 browser/meson.build                            | 3 +++
 {scriptlang => browser/scriptlang}/lexer.cpp   | 0
 {scriptlang => browser/scriptlang}/lexer.hpp   | 0
 {scriptlang => browser/scriptlang}/meson.build | 2 +-
 {scriptlang => browser/scriptlang}/parser.cpp  | 0
 {scriptlang => browser/scriptlang}/parser.hpp  | 0
 meson.build                                    | 2 --
 12 files changed, 5 insertions(+), 4 deletions(-)
 rename {markup => browser/markup}/lexer.cpp (100%)
 rename {markup => browser/markup}/lexer.hpp (100%)
 rename {markup => browser/markup}/meson.build (59%)
 rename {markup => browser/markup}/parser.cpp (100%)
 rename {markup => browser/markup}/parser.hpp (100%)
 rename {scriptlang => browser/scriptlang}/lexer.cpp (100%)
 rename {scriptlang => browser/scriptlang}/lexer.hpp (100%)
 rename {scriptlang => browser/scriptlang}/meson.build (59%)
 rename {scriptlang => browser/scriptlang}/parser.cpp (100%)
 rename {scriptlang => browser/scriptlang}/parser.hpp (100%)

diff --git a/markup/lexer.cpp b/browser/markup/lexer.cpp
similarity index 100%
rename from markup/lexer.cpp
rename to browser/markup/lexer.cpp
diff --git a/markup/lexer.hpp b/browser/markup/lexer.hpp
similarity index 100%
rename from markup/lexer.hpp
rename to browser/markup/lexer.hpp
diff --git a/markup/meson.build b/browser/markup/meson.build
similarity index 59%
rename from markup/meson.build
rename to browser/markup/meson.build
index 79dd2fe..fd2278d 100644
--- a/markup/meson.build
+++ b/browser/markup/meson.build
@@ -1,5 +1,5 @@
 
-common_sources += files(
+browser_sources += files(
     'parser.cpp',
     'lexer.cpp',
 )
diff --git a/markup/parser.cpp b/browser/markup/parser.cpp
similarity index 100%
rename from markup/parser.cpp
rename to browser/markup/parser.cpp
diff --git a/markup/parser.hpp b/browser/markup/parser.hpp
similarity index 100%
rename from markup/parser.hpp
rename to browser/markup/parser.hpp
diff --git a/browser/meson.build b/browser/meson.build
index 7c593eb..5e3b22f 100644
--- a/browser/meson.build
+++ b/browser/meson.build
@@ -1,4 +1,7 @@
 
+subdir('markup')
+subdir('scriptlang')
+
 browser_sources += files(
     'main.cpp',
 )
diff --git a/scriptlang/lexer.cpp b/browser/scriptlang/lexer.cpp
similarity index 100%
rename from scriptlang/lexer.cpp
rename to browser/scriptlang/lexer.cpp
diff --git a/scriptlang/lexer.hpp b/browser/scriptlang/lexer.hpp
similarity index 100%
rename from scriptlang/lexer.hpp
rename to browser/scriptlang/lexer.hpp
diff --git a/scriptlang/meson.build b/browser/scriptlang/meson.build
similarity index 59%
rename from scriptlang/meson.build
rename to browser/scriptlang/meson.build
index ffe15db..05cd4c6 100644
--- a/scriptlang/meson.build
+++ b/browser/scriptlang/meson.build
@@ -1,5 +1,5 @@
 
-common_sources += files(
+browser_sources += files(
     'lexer.cpp',
     'parser.cpp',
 )
diff --git a/scriptlang/parser.cpp b/browser/scriptlang/parser.cpp
similarity index 100%
rename from scriptlang/parser.cpp
rename to browser/scriptlang/parser.cpp
diff --git a/scriptlang/parser.hpp b/browser/scriptlang/parser.hpp
similarity index 100%
rename from scriptlang/parser.hpp
rename to browser/scriptlang/parser.hpp
diff --git a/meson.build b/meson.build
index b81436b..3426e6f 100644
--- a/meson.build
+++ b/meson.build
@@ -18,8 +18,6 @@ add_project_arguments(
 
 common_sources = []
 subdir('utils')
-subdir('scriptlang')
-subdir('markup')
 
 browser_sources = common_sources
 subdir('browser')