devsam/core
3
6
Fork 1
Code Issues 60 Pull Requests Releases 1 Wiki Activity

코드 일부 수정

Browse Source
This commit is contained in:
Hide_D
2019-10-09 14:43:26 +09:00
parent a3fef6c62f
commit 10fd22ba81
4 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/func_history.php
+1 -1
View File
@@ -16,7 +16,7 @@ function pushRawFileLog($path, $lines){
$lines = [$lines]; $lines = [$lines];
} }
$text = join("\n", $lines)."\n"; $text = join("\n", $lines)."\n";
file_put_contents($path, $text, FILE_APPEND); file_put_contents($path, $text, FILE_APPEND | LOCK_EX);
} }
function getRawFileLogRecent(string $path, int $count, $expectedLineLength=null){ function getRawFileLogRecent(string $path, int $count, $expectedLineLength=null){
hwe/sammo/GeneralAI.php
+1 -1
View File
@@ -1577,7 +1577,7 @@ class GeneralAI{
return ['che_건국', [ return ['che_건국', [
'nationName'=>"㉿".mb_substr($general->getName(), 1), 'nationName'=>"㉿".mb_substr($general->getName(), 1),
'nationType'=>$nationType, 'nationType'=>$nationType,
'nationColor'=>$nationColor 'colorType'=>$nationColor
]]; ]];
} }
src/sammo/StringUtil.php
+14 -13
View File
@@ -183,19 +183,20 @@ class StringUtil
} }
public static function uniord(string $c) { public static function uniord(string $c) {
if (ord($c{0}) >=0 && ord($c{0}) <= 127) $c0 = ord($c{0});
return ord($c{0}); if ($c0 >=0 && $c0 <= 127)
if (ord($c{0}) >= 192 && ord($c{0}) <= 223) return $c0;
return (ord($c{0})-192)*64 + (ord($c{1})-128); if ($c0 >= 192 && $c0 <= 223)
if (ord($c{0}) >= 224 && ord($c{0}) <= 239) return ($c0-192)*64 + (ord($c{1})-128);
return (ord($c{0})-224)*4096 + (ord($c{1})-128)*64 + (ord($c{2})-128); if ($c0 >= 224 && $c0 <= 239)
if (ord($c{0}) >= 240 && ord($c{0}) <= 247) return ($c0-224)*4096 + (ord($c{1})-128)*64 + (ord($c{2})-128);
return (ord($c{0})-240)*262144 + (ord($c{1})-128)*4096 + (ord($c{2})-128)*64 + (ord($c{3})-128); if ($c0 >= 240 && $c0 <= 247)
if (ord($c{0}) >= 248 && ord($c{0}) <= 251) return ($c0-240)*262144 + (ord($c{1})-128)*4096 + (ord($c{2})-128)*64 + (ord($c{3})-128);
return (ord($c{0})-248)*16777216 + (ord($c{1})-128)*262144 + (ord($c{2})-128)*4096 + (ord($c{3})-128)*64 + (ord($c{4})-128); if ($c0 >= 248 && $c0 <= 251)
if (ord($c{0}) >= 252 && ord($c{0}) <= 253) return ($c0-248)*16777216 + (ord($c{1})-128)*262144 + (ord($c{2})-128)*4096 + (ord($c{3})-128)*64 + (ord($c{4})-128);
return (ord($c{0})-252)*1073741824 + (ord($c{1})-128)*16777216 + (ord($c{2})-128)*262144 + (ord($c{3})-128)*4096 + (ord($c{4})-128)*64 + (ord($c{5})-128); if ($c0 >= 252 && $c0 <= 253)
if (ord($c{0}) >= 254 && ord($c{0}) <= 255) // error return ($c0-252)*1073741824 + (ord($c{1})-128)*16777216 + (ord($c{2})-128)*262144 + (ord($c{3})-128)*4096 + (ord($c{4})-128)*64 + (ord($c{5})-128);
if ($c0 >= 254 && $c0 <= 255) // error
return FALSE; return FALSE;
return 0; return 0;
} }
src/sammo/Util.php
+1 -4
View File
@@ -625,12 +625,9 @@ class Util extends \utilphp\util
} }
//.이 들어간 경우에는 분리해서 묶어야함. //.이 들어간 경우에는 분리해서 묶어야함.
return join(',', array_map(function($value){ return join(',', array_map(function($value){
$value = trim($value, " \t\r\n\0\x0b`"); $value = preg_replace('/\s/', '', $value);
if(strpos($value, '.') !== false){ if(strpos($value, '.') !== false){
$value = explode('.', $value); $value = explode('.', $value);
$value = array_map(function($str){
return trim($value, " \t\r\n\0\x0b`");
}, $value);
$value = join('`.`', $value); $value = join('`.`', $value);
} }
return "`{$value}`"; return "`{$value}`";