[ agda ] let in

owo-lang · May 16, 2019 · d3c1267 · d3c1267
1 parent c8c5954
commit d3c1267
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/org/ice1000/tt/psi/agda/parser.kt b/src/org/ice1000/tt/psi/agda/parser.kt
@@ -18,6 +18,7 @@ import com.intellij.psi.tree.TokenSet
 import org.ice1000.tt.AgdaFile
 import org.ice1000.tt.AgdaLanguage
 import org.ice1000.tt.psi.LayoutLexer
+import org.ice1000.tt.psi.LetIn
 import org.ice1000.tt.psi.State
 
 class AgdaElementType(debugName: String) : IElementType(debugName, AgdaLanguage.INSTANCE)
@@ -67,7 +68,8 @@ fun agdaLayoutLexer() = LayoutLexer(
 	AgdaTypes.LAYOUT_SEP,
 	AgdaTypes.LAYOUT_END,
 	NON_CODE,
-	LAYOUT_CREATOR
+	LAYOUT_CREATOR,
+	LetIn(AgdaTypes.KW_LET, AgdaTypes.KW_IN)
 ) { it: List<LayoutLexer.Token> ->
 	if (it.any { it.elementType == AgdaTypes.KW_MODULE }) State.Normal
 	else State.WaitingForLayout

diff --git a/src/org/ice1000/tt/psi/layout.kt b/src/org/ice1000/tt/psi/layout.kt
@@ -29,8 +29,8 @@ class LayoutLexer(
 	private val nonCodeTokens: TokenSet,
 	/*TokenSet.create(LET, OF)*/
 	private val layoutCreatingTokens: TokenSet,
-	private val initialState: (List<Token>) -> State = { WaitingForLayout },
-	private val letInTokens: LetIn? = null
+	private val letInTokens: LetIn? = null,
+	private val initialState: (List<Token>) -> State = { WaitingForLayout }
 ) : LexerBase() {
 	private val tokens = ArrayList<Token>(40)
 	private var currentTokenIndex = 0