Changed from typedef to obj and def

This commit is contained in:
Nathan Braswell
2015-05-16 12:05:23 -04:00
parent 4bc42bc516
commit 65fd2ed9b7
27 changed files with 55 additions and 47 deletions

View File

@@ -1,7 +1,7 @@
var sameVar: int;
fun sameFun(): int { return 5; }
typedef classTester {
obj classTester {
fun method(): int { return 8; }
}

View File

@@ -1,6 +1,6 @@
var sameVar: int;
fun sameFun(): int { return 6; }
typedef classTester {
obj classTester {
fun method(): int { return 9; }
}

View File

@@ -1,7 +1,7 @@
var qualified_variable: int = 7;
fun qualified_func(): int { return 9; }
typedef qualified_class {
obj qualified_class {
var number: int;
fun construct(num: int): qualified_class* {
number = num;
@@ -12,7 +12,7 @@ typedef qualified_class {
}
};
typedef qualified_container<T> {
obj qualified_container<T> {
var data: T;
fun construct(dataIn: T): qualified_container<T>* {
data = dataIn;

View File

@@ -1,7 +1,7 @@
var unqualifed_variable: int = 8;
fun unqualified_func(): int { return 10; }
typedef unqualified_class {
obj unqualified_class {
var number: int;
fun construct(num: int): unqualified_class* {
number = num;
@@ -12,7 +12,7 @@ typedef unqualified_class {
}
};
typedef unqualified_container<T> {
obj unqualified_container<T> {
var data: T;
fun construct(dataIn: T): unqualified_container<T>* {
data = dataIn;

View File

@@ -1,6 +1,6 @@
import io:*;
typedef Vec2 {
obj Vec2 {
var x: int;
var y: int;

View File

@@ -1,7 +1,7 @@
import io:*;
import mem:*;
typedef ClassWithConstructor {
obj ClassWithConstructor {
var data: int;
fun construct(inData: int): ClassWithConstructor* {
data = inData;

View File

@@ -1,6 +1,6 @@
import io:*
typedef FuncObj {
obj FuncObj {
fun operator()(a:int, b:char*): void {
println(a)
println(b)

View File

@@ -1,7 +1,7 @@
import mem:*;
import io:*;
typedef AnObject {
obj AnObject {
var a: int;
var b: int;
var c: char*;

View File

@@ -1,6 +1,6 @@
import io:*;
typedef firstObject {
obj firstObject {
var objectNum: int;
var other: int;
fun print(): void {
@@ -11,7 +11,7 @@ typedef firstObject {
}
};
typedef Int int;
def Int int;
var aliasNum: Int;

View File

@@ -1,7 +1,7 @@
import io:*;
import trivial_container:*;
typedef RegularObject {
obj RegularObject {
var num: int;
var innerContainer: trivialContainer<char*>;
fun set(message: char*, number: int): void {
@@ -17,7 +17,7 @@ typedef RegularObject {
}
};
typedef MyIntContainer trivialContainer<int>;
def MyIntContainer trivialContainer<int>;
var roundabout: MyIntContainer;
var outsideDec: RegularObject;

View File

@@ -1,6 +1,6 @@
typedef Swapper<T> {
obj Swapper<T> {
fun doit(a: T*, b: T*) : void {
var temp: T = *a;
*a = *b;

View File

@@ -1,10 +1,10 @@
import io:*;
typedef objectA {
obj objectA {
var a: int;
};
typedef BigObject {
obj BigObject {
var a: objectA;
var b: objectB;
fun add(): int {
@@ -12,7 +12,7 @@ typedef BigObject {
}
};
typedef objectB {
obj objectB {
var b: int;
};

View File

@@ -5,7 +5,7 @@ import sameNameTwo
var sameVar: int;
fun sameFun(): int { return 4; }
typedef classTester {
obj classTester {
fun method(): int {
return 7
}

View File

@@ -1,7 +1,7 @@
import io;
typedef TemplateTest<T,J> {
obj TemplateTest<T,J> {
var a: T;
var b: J;
fun print(): void {

View File

@@ -1,7 +1,7 @@
import io;
typedef TemplateTest<T> {
obj TemplateTest<T> {
var a: int;
var b: T;
fun print(): void {

View File

@@ -1,6 +1,6 @@
import io;
typedef FirstObject {
obj FirstObject {
var objectNum: int;
fun PrintSelf(a: int): void {
io::print(objectNum);

View File

@@ -2,7 +2,7 @@ import io:*
import mem:*
import vector:*
typedef pair<T, U> {
obj pair<T, U> {
var first: T
var second: U
}

View File

@@ -1,7 +1,7 @@
import io:*;
import trivial_container:*;
typedef TemplateTest<T> {
obj TemplateTest<T> {
var a: int;
var b: T;
var c: trivialContainer<T>;
@@ -17,7 +17,7 @@ typedef TemplateTest<T> {
}
};
typedef MyInt int;
def MyInt int;
var c: MyInt;

View File

@@ -1,11 +1,11 @@
import io:*;
typedef NoTraits {};
obj NoTraits {};
typedef Trait1 (FirstTrait) {};
typedef Trait2 (SecondTrait) {};
typedef TwoTrait (FirstTrait, SecondTrait) {};
typedef AlreadySpecilized (FirstTrait, SecondTrait) {};
obj Trait1 (FirstTrait) {};
obj Trait2 (SecondTrait) {};
obj TwoTrait (FirstTrait, SecondTrait) {};
obj AlreadySpecilized (FirstTrait, SecondTrait) {};
fun OneTwoFunc<T>(obj: T): void {
println("No Traits");
@@ -30,12 +30,12 @@ template <AlreadySpecilized> |void| OneTwoFunc(|AlreadySpecilized| obj) {
//This should work for objects too!
//To test, we cycle the mapping of traits
typedef OneTwoObj<T> (FirstTrait) {};
typedef OneTwoObj<T(FirstTrait)> (SecondTrait) {};
typedef OneTwoObj<T(SecondTrait)> (FirstTrait, SecondTrait) {};
typedef OneTwoObj<T(FirstTrait, SecondTrait)> {};
obj OneTwoObj<T> (FirstTrait) {};
obj OneTwoObj<T(FirstTrait)> (SecondTrait) {};
obj OneTwoObj<T(SecondTrait)> (FirstTrait, SecondTrait) {};
obj OneTwoObj<T(FirstTrait, SecondTrait)> {};
/*
*typedef template<AlreadySpecilized> OneTwoObj {
*obj template<AlreadySpecilized> OneTwoObj {
* void proveSpecilized() {
* println("I'm specilized!");
* }

View File

@@ -1,6 +1,6 @@
import io;
typedef ClassWithConstructor {
obj ClassWithConstructor {
var data: int;
fun construct(inData: int): ClassWithConstructor* {
data = inData;

View File

@@ -7,11 +7,11 @@ fun retMessage(): char* {
}
fun id<T>(in: T): T { return in; }
typedef CustomObj {
obj CustomObj {
var data: int;
}
typedef CustomObjTmplt<T> {
obj CustomObjTmplt<T> {
var data: T;
}
fun inFun<T>(in: T):T {

View File

@@ -2,7 +2,7 @@ import io:*;
import mem:*;
import vector:*;
typedef AbleToBeDestroyed (Destructable) {
obj AbleToBeDestroyed (Destructable) {
fun destruct(): void {
println("Destroyed!");
}