Merge branch 'syntax' of 192.168.10.104:suwako/LittleBeast into syntax

諏訪子 <suwako@076.moe>、2026-05-06 03:05
コミット 1c71e01a6355ae553b6b3d8a5826d5fd4b478a72 ・親 594e259 ・親 e5b63c7 ・ファイルを見る

16個のファイル、+42 -34

@@ -44,6 +44,8 @@
4444
4545 use Site\Lib\Syntax; // TEST
4646
47+use Std\Lib\Syntax; // TEST
48+
4749 class Page {
4850 use Mods;
4951
@@ -1,14 +1,14 @@
11 <?php
2-namespace Site\Lib;
2+namespace Std\Lib;
33
4-use Site\Lib\Syntax\SyntaxInterface;
5-use Site\Lib\Syntax\AsmAarch32;
6-use Site\Lib\Syntax\AsmAarch64;
7-use Site\Lib\Syntax\AsmX8664;
8-use Site\Lib\Syntax\C;
9-use Site\Lib\Syntax\Cpp;
10-use Site\Lib\Syntax\Glsl;
11-use Site\Lib\Syntax\Go;
4+use Std\Lib\Syntax\SyntaxInterface;
5+use Std\Lib\Syntax\AsmAarch32;
6+use Std\Lib\Syntax\AsmAarch64;
7+use Std\Lib\Syntax\AsmX8664;
8+use Std\Lib\Syntax\C;
9+use Std\Lib\Syntax\Cpp;
10+use Std\Lib\Syntax\Glsl;
11+use Std\Lib\Syntax\Go;
1212
1313 class Syntax {
1414 private array $alt = [
@@ -1,7 +1,7 @@
11 <?php
2-namespace Site\Lib\Syntax;
2+namespace Std\Lib\Syntax;
33
4-use Site\Lib\Syntax\SyntaxInterface;
4+use Std\Lib\Syntax\SyntaxInterface;
55
66 class Asm6502 implements SyntaxInterface {
77 private array $colors = [];
@@ -1,7 +1,7 @@
11 <?php
2-namespace Site\Lib\Syntax;
2+namespace Std\Lib\Syntax;
33
4-use Site\Lib\Syntax\SyntaxInterface;
4+use Std\Lib\Syntax\SyntaxInterface;
55
66 class Asm68000 implements SyntaxInterface {
77 private array $colors = [];
@@ -1,7 +1,7 @@
11 <?php
2-namespace Site\Lib\Syntax;
2+namespace Std\Lib\Syntax;
33
4-use Site\Lib\Syntax\SyntaxInterface;
4+use Std\Lib\Syntax\SyntaxInterface;
55
66 class AsmAarch32 implements SyntaxInterface {
77 private array $colors = [];
@@ -1,7 +1,13 @@
11 <?php
2+<<<<<<< HEAD
23 namespace Site\Lib\Syntax;
34
45 use Site\Lib\Syntax\SyntaxInterface;
6+=======
7+namespace Std\Lib\Syntax;
8+
9+use Std\Lib\Syntax\SyntaxInterface;
10+>>>>>>> e5b63c7fd62912c2232317dbc7ae73524dc1b767
511
612 class AsmAarch64 implements SyntaxInterface {
713 private array $colors = [];
@@ -1,7 +1,7 @@
11 <?php
2-namespace Site\Lib\Syntax;
2+namespace Std\Lib\Syntax;
33
4-use Site\Lib\Syntax\SyntaxInterface;
4+use Std\Lib\Syntax\SyntaxInterface;
55
66 class AsmMips implements SyntaxInterface {
77 private array $colors = [];
@@ -1,7 +1,7 @@
11 <?php
2-namespace Site\Lib\Syntax;
2+namespace Std\Lib\Syntax;
33
4-use Site\Lib\Syntax\SyntaxInterface;
4+use Std\Lib\Syntax\SyntaxInterface;
55
66 class AsmPower implements SyntaxInterface {
77 private array $colors = [];
@@ -1,7 +1,7 @@
11 <?php
2-namespace Site\Lib\Syntax;
2+namespace Std\Lib\Syntax;
33
4-use Site\Lib\Syntax\SyntaxInterface;
4+use Std\Lib\Syntax\SyntaxInterface;
55
66 class AsmRiscV implements SyntaxInterface {
77 private array $colors = [];
@@ -1,7 +1,7 @@
11 <?php
2-namespace Site\Lib\Syntax;
2+namespace Std\Lib\Syntax;
33
4-use Site\Lib\Syntax\SyntaxInterface;
4+use Std\Lib\Syntax\SyntaxInterface;
55
66 class AsmX8664 implements SyntaxInterface {
77 private array $colors = [];
@@ -1,7 +1,7 @@
11 <?php
2-namespace Site\Lib\Syntax;
2+namespace Std\Lib\Syntax;
33
4-use Site\Lib\Syntax\SyntaxInterface;
4+use Std\Lib\Syntax\SyntaxInterface;
55
66 class AsmZ80 implements SyntaxInterface {
77 private array $colors = [];
@@ -1,7 +1,7 @@
11 <?php
2-namespace Site\Lib\Syntax;
2+namespace Std\Lib\Syntax;
33
4-use Site\Lib\Syntax\SyntaxInterface;
4+use Std\Lib\Syntax\SyntaxInterface;
55
66 class C implements SyntaxInterface {
77 private array $colors = [];
@@ -1,7 +1,7 @@
11 <?php
2-namespace Site\Lib\Syntax;
2+namespace Std\Lib\Syntax;
33
4-use Site\Lib\Syntax\SyntaxInterface;
4+use Std\Lib\Syntax\SyntaxInterface;
55
66 class Cpp implements SyntaxInterface {
77 private array $colors = [];
@@ -1,7 +1,7 @@
11 <?php
2-namespace Site\Lib\Syntax;
2+namespace Std\Lib\Syntax;
33
4-use Site\Lib\Syntax\SyntaxInterface;
4+use Std\Lib\Syntax\SyntaxInterface;
55
66 class Glsl implements SyntaxInterface {
77 private array $colors = [];
@@ -1,7 +1,7 @@
11 <?php
2-namespace Site\Lib\Syntax;
2+namespace Std\Lib\Syntax;
33
4-use Site\Lib\Syntax\SyntaxInterface;
4+use Std\Lib\Syntax\SyntaxInterface;
55
66 class Go implements SyntaxInterface {
77 private array $colors = [];
@@ -1,5 +1,5 @@
11 <?php
2-namespace Site\Lib\Syntax;
2+namespace Std\Lib\Syntax;
33
44 interface SyntaxInterface {
55 public function getColors(): array;