lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Code format braces.

Browse Source
This commit is contained in:
MobiusDev
2017-08-31 11:54:12 +00:00
parent ce279555a0
commit 3615456155
297 changed files with 6280 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/exp4j/Expression.java
View File

@@ -137,9 +137,12 @@ public class Expression
{
case Token.TOKEN_NUMBER:
case Token.TOKEN_VARIABLE:
{
count++;
break;
}
case Token.TOKEN_FUNCTION:
{
final Function func = ((FunctionToken) tok).getFunction();
final int argsNum = func.getNumArguments();
if (argsNum > count)
@@ -156,13 +159,16 @@ public class Expression
count++;
}
break;
}
case Token.TOKEN_OPERATOR:
{
Operator op = ((OperatorToken) tok).getOperator();
if (op.getNumOperands() == 2)
{
count--;
}
break;
}
}
if (count < 1)
{

14
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/exp4j/Operators.java
View File

@@ -109,27 +109,41 @@ public abstract class Operators
switch (symbol)
{
case '+':
{
if (numArguments != 1)
{
return builtinOperators[INDEX_ADDITION];
}
return builtinOperators[INDEX_UNARYPLUS];
}
case '-':
{
if (numArguments != 1)
{
return builtinOperators[INDEX_SUBTRACTION];
}
return builtinOperators[INDEX_UNARYMINUS];
}
case '*':
{
return builtinOperators[INDEX_MUTLIPLICATION];
}
case '/':
{
return builtinOperators[INDEX_DIVISION];
}
case '^':
{
return builtinOperators[INDEX_POWER];
}
case '%':
{
return builtinOperators[INDEX_MODULO];
}
default:
{
return null;
}
}
}
}

14
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/exp4j/ShuntingYard.java
View File

@@ -48,12 +48,17 @@ public class ShuntingYard
{
case Token.TOKEN_NUMBER:
case Token.TOKEN_VARIABLE:
{
output.add(token);
break;
}
case Token.TOKEN_FUNCTION:
{
stack.add(token);
break;
}
case Token.TOKEN_SEPARATOR:
{
while (!stack.empty() && (stack.peek().getType() != Token.TOKEN_PARENTHESES_OPEN))
{
output.add(stack.pop());
@@ -63,7 +68,9 @@ public class ShuntingYard
throw new IllegalArgumentException("Misplaced function separator ',' or mismatched parentheses");
}
break;
}
case Token.TOKEN_OPERATOR:
{
while (!stack.empty() && (stack.peek().getType() == Token.TOKEN_OPERATOR))
{
OperatorToken o1 = (OperatorToken) token;
@@ -83,10 +90,14 @@ public class ShuntingYard
}
stack.push(token);
break;
}
case Token.TOKEN_PARENTHESES_OPEN:
{
stack.push(token);
break;
}
case Token.TOKEN_PARENTHESES_CLOSE:
{
while (stack.peek().getType() != Token.TOKEN_PARENTHESES_OPEN)
{
output.add(stack.pop());
@@ -97,8 +108,11 @@ public class ShuntingYard
output.add(stack.pop());
}
break;
}
default:
{
throw new IllegalArgumentException("Unknown Token type encountered. This should not happen");
}
}
}
while (!stack.empty())

19
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/tools/geodataconverter/GeoDataConverter.java
View File

@@ -159,19 +159,24 @@ public final class GeoDataConverter
switch (type)
{
case GeoStructure.TYPE_FLAT_L2J_L2OFF:
{
_blocks[ix][iy] = new BlockFlat(buffer, _format);
break;
}
case GeoStructure.TYPE_COMPLEX_L2J:
{
_blocks[ix][iy] = new BlockComplex(buffer, _format);
break;
}
case GeoStructure.TYPE_MULTILAYER_L2J:
{
_blocks[ix][iy] = new BlockMultilayer(buffer, _format);
break;
}
default:
{
throw new IllegalArgumentException("Unknown block type: " + type);
}
}
}
else
@@ -183,16 +188,20 @@ public final class GeoDataConverter
switch (type)
{
case GeoStructure.TYPE_FLAT_L2J_L2OFF:
{
_blocks[ix][iy] = new BlockFlat(buffer, _format);
break;
}
case GeoStructure.TYPE_COMPLEX_L2OFF:
{
_blocks[ix][iy] = new BlockComplex(buffer, _format);
break;
}
default:
{
_blocks[ix][iy] = new BlockMultilayer(buffer, _format);
break;
}
}
}
}