From a5cf92dacc2dca4052d9da2f5c8c8720a86d1d24 Mon Sep 17 00:00:00 2001 From: laurayuwen Date: Sat, 7 Nov 2015 16:27:04 -0600 Subject: [PATCH] fix imports and missing syntax --- src/common/aux-strings.k | 2 ++ src/common/lexical-syntax.k | 2 ++ src/common/list-syntax.k | 37 ++++++++++++++++++++++++++++++++++++- 3 files changed, 40 insertions(+), 1 deletion(-) diff --git a/src/common/aux-strings.k b/src/common/aux-strings.k index 86398b54..2977fcfa 100644 --- a/src/common/aux-strings.k +++ b/src/common/aux-strings.k @@ -1,4 +1,6 @@ +require "domains.k" module AUX-STRINGS + imports DOMAINS-SYNTAX /*@ Auxiliary constructs related to Strings. Extension to string.k.*/ //@Retain the first Count chars in the string diff --git a/src/common/lexical-syntax.k b/src/common/lexical-syntax.k index 61d4a177..a1905fd2 100644 --- a/src/common/lexical-syntax.k +++ b/src/common/lexical-syntax.k @@ -1,4 +1,6 @@ +require "domains.k" module LEXICAL-SYNTAX + imports FLOAT-SYNTAX //@ \subsection{Comments.sdf} //no need to define because K provides fixed layout diff --git a/src/common/list-syntax.k b/src/common/list-syntax.k index 43e2b12a..15bc1b7e 100644 --- a/src/common/list-syntax.k +++ b/src/common/list-syntax.k @@ -34,7 +34,6 @@ syntax ClassBodyDecList ::= List{ClassBodyDec, ""} [klabel('Cl syntax BlockStmList ::= List{BlockStmt, ""} [klabel('BlockStmList)] syntax SwitchGroupList ::= List{SwitchGroup, ""} [klabel('SwitchGroupList)] syntax SwitchLabelList ::= List{SwitchLabel, ""} [klabel('SwitchLabelList)] - syntax Exps ::= List{Exp, ","} [klabel('ExprList), seqstrict] syntax Dims ::= List{Dim,""} [klabel('DimList)] syntax DimExps ::= List{DimExp,""} [klabel('DimExprList), strict] @@ -45,4 +44,40 @@ syntax Params ::= List{Param, ","} [klabel('Fo context 'FormalParamList(HOLE,,_) [result(Param)] context 'FormalParamList(_,,HOLE) [result(Params)] + +syntax InterfaceType +syntax ExceptionType +syntax Id +syntax TypeDec +syntax VarDec +syntax ImportDec +syntax ActualTypeArg +syntax ClassOrInterfaceType +syntax TypeParam +syntax AbstractMethodMod +syntax AnnoAbstractMethodMod +syntax AnnoMethodMod +syntax AnnoVarMod +syntax AnnoClassMod +syntax AnnoConstrMod +syntax AnnoConstantMod +syntax AnnoFieldMod +syntax AnnoInterfaceMod +syntax Anno +syntax AnnoElemDec +syntax InterfaceMemberDec +syntax ElemValPair +syntax ElemVal +syntax StringPart +syntax EnumConst +syntax ClassBodyDec +syntax BlockStmt +syntax SwitchGroup +syntax SwitchLabel +syntax Exp +syntax Dim +syntax DimExp +syntax VarInit +syntax CatchClause +syntax Param endmodule \ No newline at end of file