Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Fred Eisele
fql
Commits
30f949ce
Commit
30f949ce
authored
Aug 22, 2018
by
Fred Eisele
Browse files
remove *Ex methods
parent
3e73d877
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/catdata/aql/exp/AqlLoaderListener.java
View file @
30f949ce
...
...
@@ -397,12 +397,12 @@ public class AqlLoaderListener extends AqlParserBaseListener {
@Override
public
void
exitTypesideRef
(
AqlParser
.
TypesideRefContext
ctx
)
{
this
.
exp_ty
.
put
(
ctx
,
new
TyExp
.
TyExpVar
<>(
ctx
.
getText
()));
this
.
exp_ty
.
put
(
ctx
,
new
TyExp
.
TyExpVar
<
Ty
,
Sym
>(
ctx
.
getText
()));
}
@Override
public
void
exitTypesideExp_Empty
(
AqlParser
.
TypesideExp_EmptyContext
ctx
)
{
final
TyExp
<
Ty
,
Sym
>
exp
=
new
TyExp
.
TyExpEmpty
Ex
<
Ty
,
Sym
>
();
final
TyExp
I
exp
=
new
TyExp
.
TyExpEmpty
();
this
.
exp_ty
.
put
(
ctx
,
exp
);
}
...
...
src/catdata/aql/exp/TyExp.java
View file @
30f949ce
...
...
@@ -78,7 +78,7 @@ public abstract class TyExp<Ty, Sym> extends Exp<TypeSide<Ty, Sym>> {
////////////////////////////////////////////////////////////////////////////////////////////////////
public
static
final
class
TyExpEmpty
extends
TyExp
<
Void
,
Void
>
{
public
static
final
class
TyExpEmpty
extends
TyExp
<
Void
,
Void
>
implements
TyExpI
{
@Override
public
Collection
<
Pair
<
String
,
Kind
>>
deps
()
{
...
...
@@ -172,7 +172,7 @@ public abstract class TyExp<Ty, Sym> extends Exp<TypeSide<Ty, Sym>> {
////////////////////////////////////////////////////////////////////////////////////////////////////
public
static
final
class
TyExpVar
<
X
,
Y
>
extends
TyExp
<
X
,
Y
>
{
public
static
final
class
TyExpVar
<
X
,
Y
>
extends
TyExp
<
X
,
Y
>
implements
TyExpI
{
public
final
String
var
;
@Override
...
...
src/catdata/aql/exp/TyExpI.java
View file @
30f949ce
...
...
@@ -5,11 +5,11 @@ import java.util.Collection;
import
catdata.Pair
;
import
catdata.Program
;
import
catdata.aql.Kind
;
import
catdata.aql.TypeSide
;
import
catdata.aql.TypeSide
I
;
public
interface
TyExpI
<
Ty
,
Sym
>
extends
ExpI
<
TypeSide
<
Ty
,
Sym
>
>
{
public
interface
TyExpI
extends
ExpI
<
TypeSide
I
>
{
public
TyExpI
<
Ty
,
Sym
>
resolve
(
Program
<
Exp
<?>
>
prog
);
public
TyExpI
resolve
(
Program
<
Exp
I
>
prog
);
public
Kind
kind
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment