From a5547b2c64187480f34b136b5eec89b6c5559202 Mon Sep 17 00:00:00 2001 From: Yingchi Long Date: Tue, 16 Jan 2024 21:30:12 +0800 Subject: [PATCH] libnixf: arrange project structure --- libnixf/meson.build | 12 ++++++------ libnixf/{lib => src}/Basic/Diagnostic.cpp | 0 libnixf/{lib => src}/Parse/Lexer.cpp | 0 libnixf/{lib => src}/Parse/Lexer.h | 0 libnixf/{lib => src}/Parse/Parser.cpp | 0 libnixf/{lib => src}/Parse/Token.h | 0 libnixf/{lib => src}/Parse/TokenKinds.inc | 0 libnixf/{lib => src}/Parse/Tokens.inc | 0 libnixf/{lib/Parse/test => test/Parse}/Lexer.cpp | 0 libnixf/{lib/Parse/test => test/Parse}/Parser.cpp | 0 10 files changed, 6 insertions(+), 6 deletions(-) rename libnixf/{lib => src}/Basic/Diagnostic.cpp (100%) rename libnixf/{lib => src}/Parse/Lexer.cpp (100%) rename libnixf/{lib => src}/Parse/Lexer.h (100%) rename libnixf/{lib => src}/Parse/Parser.cpp (100%) rename libnixf/{lib => src}/Parse/Token.h (100%) rename libnixf/{lib => src}/Parse/TokenKinds.inc (100%) rename libnixf/{lib => src}/Parse/Tokens.inc (100%) rename libnixf/{lib/Parse/test => test/Parse}/Lexer.cpp (100%) rename libnixf/{lib/Parse/test => test/Parse}/Parser.cpp (100%) diff --git a/libnixf/meson.build b/libnixf/meson.build index 44612ac2b..336477f1d 100644 --- a/libnixf/meson.build +++ b/libnixf/meson.build @@ -4,9 +4,9 @@ libnixf_inc = include_directories('include') libnixf = library( 'nixf', - 'lib/Basic/Diagnostic.cpp', - 'lib/Parse/Lexer.cpp', - 'lib/Parse/Parser.cpp', + 'src/Basic/Diagnostic.cpp', + 'src/Parse/Lexer.cpp', + 'src/Parse/Parser.cpp', include_directories: libnixf_inc, dependencies: libnixf_deps, install: true, @@ -28,10 +28,10 @@ nixf = declare_dependency( test('unit/libnixf/Parse', executable('unit-libnixf-parse', - 'lib/Parse/test/Lexer.cpp', - 'lib/Parse/test/Parser.cpp', + 'test/Parse/Lexer.cpp', + 'test/Parse/Parser.cpp', dependencies: [ nixf, gtest_main ], - include_directories: [ 'lib/Parse' ] # Private headers + include_directories: [ 'src/Parse' ] # Private headers ) ) diff --git a/libnixf/lib/Basic/Diagnostic.cpp b/libnixf/src/Basic/Diagnostic.cpp similarity index 100% rename from libnixf/lib/Basic/Diagnostic.cpp rename to libnixf/src/Basic/Diagnostic.cpp diff --git a/libnixf/lib/Parse/Lexer.cpp b/libnixf/src/Parse/Lexer.cpp similarity index 100% rename from libnixf/lib/Parse/Lexer.cpp rename to libnixf/src/Parse/Lexer.cpp diff --git a/libnixf/lib/Parse/Lexer.h b/libnixf/src/Parse/Lexer.h similarity index 100% rename from libnixf/lib/Parse/Lexer.h rename to libnixf/src/Parse/Lexer.h diff --git a/libnixf/lib/Parse/Parser.cpp b/libnixf/src/Parse/Parser.cpp similarity index 100% rename from libnixf/lib/Parse/Parser.cpp rename to libnixf/src/Parse/Parser.cpp diff --git a/libnixf/lib/Parse/Token.h b/libnixf/src/Parse/Token.h similarity index 100% rename from libnixf/lib/Parse/Token.h rename to libnixf/src/Parse/Token.h diff --git a/libnixf/lib/Parse/TokenKinds.inc b/libnixf/src/Parse/TokenKinds.inc similarity index 100% rename from libnixf/lib/Parse/TokenKinds.inc rename to libnixf/src/Parse/TokenKinds.inc diff --git a/libnixf/lib/Parse/Tokens.inc b/libnixf/src/Parse/Tokens.inc similarity index 100% rename from libnixf/lib/Parse/Tokens.inc rename to libnixf/src/Parse/Tokens.inc diff --git a/libnixf/lib/Parse/test/Lexer.cpp b/libnixf/test/Parse/Lexer.cpp similarity index 100% rename from libnixf/lib/Parse/test/Lexer.cpp rename to libnixf/test/Parse/Lexer.cpp diff --git a/libnixf/lib/Parse/test/Parser.cpp b/libnixf/test/Parse/Parser.cpp similarity index 100% rename from libnixf/lib/Parse/test/Parser.cpp rename to libnixf/test/Parse/Parser.cpp