kristoferssolo/mdemory
1
0
Fork 0
mirror of https://github.com/jorenchik/mdemory.git synced 2026-03-22 00:26:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix parser -> works with multi and single answer question

Browse Source
This commit is contained in:
jorenchik
2024-09-06 21:41:19 +03:00
parent 1a2c961807
commit 0a09831d17
2 changed files with 55 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/compiler/lexer/lexer.go
View File

@@ -46,7 +46,7 @@ func (token Token) ToString() string {
)
}
return fmt.Sprintf(
"%s: \"%s\" %d:%d\n",
"%20s: %35s %3d:%3d\n",
ToString(&token.TokenType),
content,
token.Row,

65
src/compiler/parser/parser.go
View File

@@ -32,8 +32,10 @@ type MultipleChoiceQuestion struct {
func (question SingleAnswerQuestion) ToString() string {
return fmt.Sprintf(
"<Single choice> (%s) %s: %s\n",
"%20s: section: %-10s id: %-10s %-30s: %-30s\n",
"<Single choice>",
question.Section,
question.ID,
strings.Trim(question.Question, "\t\n "),
strings.Trim(question.Answer, "\t\n "),
)
@@ -42,8 +44,10 @@ func (question SingleAnswerQuestion) ToString() string {
func (question MultipleChoiceQuestion) ToString() string {
acc := ""
acc += fmt.Sprintf(
"<Multi choice> (%s) %s\n",
"%20s: section: %-10s id: %-10s %-30s\n",
"<Multi choice>",
question.section,
question.id,
question.question,
)
for _, el := range question.choices {
@@ -171,17 +175,46 @@ func ParseQuestions(fileContents string) ([]Question, error) {
if i >= len(tokens) {
break
}
// - [identifier] question_token >
if tokens[i].TokenType == lexer.ElementDashStart {
id := tokens[i+2].Content
question := tokens[i+4].Content
quesitonElements := []QuestionElement{}
var id string
var question string
var questionElements []QuestionElement
if tokens[i + 1].TokenType == lexer.IdentifierStart {
id = tokens[i + 2].Content
question = tokens[i + 4].Content
questionElements = []QuestionElement{}
i += 6
} else {
id = ""
question = tokens[i + 1].Content
questionElements = []QuestionElement{}
i += 3
}
for {
if i+1 >= len(tokens) ||
!(tokens[i].TokenType == lexer.ElementDashStart ||
tokens[i].TokenType == lexer.ElementPlusStart) ||
tokens[i+1].TokenType == lexer.IdentifierStart {
// Pointer is on the start of an element
// - a_question >
// - [identifier] a_question >
// - an_element
// terminate if we encounter a question.
if i + 3 < len(tokens) &&
tokens[i + 3].TokenType != lexer.EOF {
offset := 0
if tokens[i + 1].TokenType == lexer.IdentifierStart {
offset = 5
} else {
offset = 2
}
if i + offset < len(tokens) &&
tokens[i + offset].TokenType == lexer.QuestionEnd {
break
}
}
if (i + 2 >= len(tokens)) {
break;
}
questionElement := QuestionElement{}
if tokens[i].TokenType == lexer.ElementDashStart {
@@ -190,19 +223,19 @@ func ParseQuestions(fileContents string) ([]Question, error) {
questionElement.isDash = false
}
questionElement.content = tokens[i + 1].Content
quesitonElements = append(quesitonElements, questionElement)
questionElements = append(questionElements, questionElement)
i += 2
}
if len(quesitonElements) > 1 {
if len(questionElements) > 1 {
question := MultipleChoiceQuestion{
id: id,
question: question,
}
choices := []Choice{}
for k := 0; k < len(quesitonElements); k++ {
for k := 0; k < len(questionElements); k++ {
choice := Choice{}
choice.answer = quesitonElements[k].content
choice.isCorrect = !quesitonElements[k].isDash
choice.answer = questionElements[k].content
choice.isCorrect = !questionElements[k].isDash
choices = append(choices, choice)
}
if section != "" {
@@ -210,11 +243,11 @@ func ParseQuestions(fileContents string) ([]Question, error) {
}
question.choices = choices
questions = append(questions, question)
} else if len(quesitonElements) == 1 {
} else if len(questionElements) == 1 {
question := SingleAnswerQuestion{
ID: id,
Question: question,
Answer: quesitonElements[0].content,
Answer: questionElements[0].content,
}
if section != "" {
question.Section = section