mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-05-02 19:39:56 -05:00
Code Issues Packages Projects Releases 159 Wiki Activity

Merge pull request #511 from arv/eslint-switch-indent

Browse Source 
JS: Update lint rule for indenting switch statements
This commit is contained in:
Rafael Weinstein
2015-10-28 17:51:47 -07:00
parent 11cdebf605 01d6d3c594
commit 496613e038
4 changed files with 91 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js2/.eslintrc
+1 -1
View File
@@ -3,7 +3,7 @@
"rules": {
"camelcase": 2,
"eqeqeq": 2,
"indent": [2, 2],
"indent": [2, 2, {"SwitchCase": 1}],
"linebreak-style": [2, "unix"],
"no-new-wrappers": 2,
"no-var": 2,
js2/src/decode.js
+61 -61
View File
@@ -81,24 +81,24 @@ class JsonArrayReader {
readTypeRefAsTag(): TypeRef {
let kind = this.readKind();
switch (kind) {
case Kind.List:
case Kind.Set:
case Kind.Ref: {
let elemType = this.readTypeRefAsTag();
return makeCompoundTypeRef(kind, elemType);
}
case Kind.Map: {
let keyType = this.readTypeRefAsTag();
let valueType = this.readTypeRefAsTag();
return makeCompoundTypeRef(kind, keyType, valueType);
}
case Kind.TypeRef:
return makePrimitiveTypeRef(Kind.TypeRef);
case Kind.Unresolved: {
let pkgRef = this.readRef();
let ordinal = this.readOrdinal();
return makeTypeRef(pkgRef, ordinal);
}
case Kind.List:
case Kind.Set:
case Kind.Ref: {
let elemType = this.readTypeRefAsTag();
return makeCompoundTypeRef(kind, elemType);
}
case Kind.Map: {
let keyType = this.readTypeRefAsTag();
let valueType = this.readTypeRefAsTag();
return makeCompoundTypeRef(kind, keyType, valueType);
}
case Kind.TypeRef:
return makePrimitiveTypeRef(Kind.TypeRef);
case Kind.Unresolved: {
let pkgRef = this.readRef();
let ordinal = this.readOrdinal();
return makeTypeRef(pkgRef, ordinal);
}
}
if (isPrimitiveKind(kind)) {
@@ -150,49 +150,49 @@ class JsonArrayReader {
readValueWithoutTag(t: TypeRef, pkg: ?Ref = null): any {
// TODO: Verify read values match tagged kinds.
switch (t.kind) {
case Kind.Blob:
throw new Error('Not implemented');
case Kind.Bool:
return this.readBool();
case Kind.UInt8:
case Kind.UInt16:
case Kind.UInt32:
case Kind.UInt64:
case Kind.Int8:
case Kind.Int16:
case Kind.Int32:
case Kind.Int64:
case Kind.Float32:
case Kind.Float64:
return this.read();
case Kind.String:
return this.readString();
case Kind.Value: {
let t2 = this.readTypeRefAsTag();
return this.readValueWithoutTag(t2, pkg);
}
case Kind.List: {
let r2 = new JsonArrayReader(this.readArray(), this._cs);
return r2.readList(t, pkg);
}
case Kind.Map: {
let r2 = new JsonArrayReader(this.readArray(), this._cs);
return r2.readMap(t, pkg);
}
case Kind.Package:
throw new Error('Not implemented');
case Kind.Ref:
throw new Error('Not implemented');
case Kind.Set: {
let r2 = new JsonArrayReader(this.readArray(), this._cs);
return r2.readSet(t, pkg);
}
case Kind.Enum:
case Kind.Struct:
throw new Error('Not allowed');
case Kind.TypeRef:
case Kind.Unresolved:
throw new Error('Not implemented');
case Kind.Blob:
throw new Error('Not implemented');
case Kind.Bool:
return this.readBool();
case Kind.UInt8:
case Kind.UInt16:
case Kind.UInt32:
case Kind.UInt64:
case Kind.Int8:
case Kind.Int16:
case Kind.Int32:
case Kind.Int64:
case Kind.Float32:
case Kind.Float64:
return this.read();
case Kind.String:
return this.readString();
case Kind.Value: {
let t2 = this.readTypeRefAsTag();
return this.readValueWithoutTag(t2, pkg);
}
case Kind.List: {
let r2 = new JsonArrayReader(this.readArray(), this._cs);
return r2.readList(t, pkg);
}
case Kind.Map: {
let r2 = new JsonArrayReader(this.readArray(), this._cs);
return r2.readMap(t, pkg);
}
case Kind.Package:
throw new Error('Not implemented');
case Kind.Ref:
throw new Error('Not implemented');
case Kind.Set: {
let r2 = new JsonArrayReader(this.readArray(), this._cs);
return r2.readSet(t, pkg);
}
case Kind.Enum:
case Kind.Struct:
throw new Error('Not allowed');
case Kind.TypeRef:
case Kind.Unresolved:
throw new Error('Not implemented');
}
throw new Error('Unreached');
js2/src/noms_kind.js
+19 -19
View File
@@ -56,24 +56,24 @@ export const Kind: {
export function isPrimitiveKind(k: NomsKind): boolean {
switch (k) {
case Kind.Bool:
case Kind.Int8:
case Kind.Int16:
case Kind.Int32:
case Kind.Int64:
case Kind.Float32:
case Kind.Float64:
case Kind.UInt8:
case Kind.UInt16:
case Kind.UInt32:
case Kind.UInt64:
case Kind.String:
case Kind.Blob:
case Kind.Value:
case Kind.TypeRef:
case Kind.Package:
return true;
default:
return false;
case Kind.Bool:
case Kind.Int8:
case Kind.Int16:
case Kind.Int32:
case Kind.Int64:
case Kind.Float32:
case Kind.Float64:
case Kind.UInt8:
case Kind.UInt16:
case Kind.UInt32:
case Kind.UInt64:
case Kind.String:
case Kind.Blob:
case Kind.Value:
case Kind.TypeRef:
case Kind.Package:
return true;
default:
return false;
}
}
js2/src/type_ref.js
+10 -10
View File
@@ -157,17 +157,17 @@ function buildType(n: string, desc: TypeDesc): TypeRef {
}
switch (desc.kind) {
case Kind.List:
case Kind.Ref:
case Kind.Set:
case Kind.Map:
case Kind.Enum:
case Kind.Struct:
case Kind.Unresolved:
return new TypeRef(n, '', desc);
case Kind.List:
case Kind.Ref:
case Kind.Set:
case Kind.Map:
case Kind.Enum:
case Kind.Struct:
case Kind.Unresolved:
return new TypeRef(n, '', desc);
default:
throw new Error('Unrecognized Kind: ' + desc.kind);
default:
throw new Error('Unrecognized Kind: ' + desc.kind);
}
}