github/semantic
1
1
Fork 0
mirror of https://github.com/github/semantic.git synced 2024-11-24 08:54:07 +03:00
Code Issues Projects Releases Wiki Activity

Reorder json syntax and regenerate types.proto

Browse Source
This commit is contained in:
joshvera 2018-06-12 14:13:36 -04:00
parent ad16758895
commit b7241a5a1c
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Language/JSON/Assignment.hs
View File

@ -18,12 +18,12 @@ import Language.JSON.Grammar as Grammar
import Prologue
type Syntax =
[ Literal.Array
[ Literal.Null
, Literal.Array
, Literal.Boolean
, Literal.Hash
, Literal.Float
, Literal.KeyValue
, Literal.Null
, Literal.TextElement
, Syntax.Error
]

18
types.proto
View File

@ -30,7 +30,7 @@ message SrcLoc { string srcLocPackage = 1;
int64 srcLocEndLine = 6;
int64 srcLocEndCol = 7;
}
message ErrorSite { bytes errorMessage = 1;
message ErrorSite { string errorMessage = 1;
SrcLoc errorLocation = 2;
}
message Error { repeated ErrorSite errorCallStack = 1;
@ -44,20 +44,20 @@ message Boolean { bool booleanContent = 1;
}
message Hash { repeated Term hashElements = 1;
}
message Float { bytes floatContent = 1;
message Float { string floatContent = 1;
}
message KeyValue { Term key = 1;
Term value = 2;
}
message Null {
}
message TextElement { bytes textElementContent = 1;
message TextElement { string textElementContent = 1;
}
message Term { oneof syntax {Array array = 1;
Boolean boolean = 2;
Hash hash = 3;
Float float = 4;
KeyValue keyValue = 5;
Null null = 6;
message Term { oneof syntax {Null null = 1;
Array array = 2;
Boolean boolean = 3;
Hash hash = 4;
Float float = 5;
KeyValue keyValue = 6;
TextElement textElement = 7;}
}