Synopsis Home

From stefan at synopsis.fresco.org Fri Oct 3 14:27:35 2003 From: stefan at synopsis.fresco.org (Stefan Seefeld) Date: Wed Mar 2 21:06:36 2005 Subject: [Synopsis-changes] Synopsis/Synopsis/Synopsis/Formatter DUMP.py,1.14,1.15 Message-ID: Update of /cvs/synopsis/Synopsis/Synopsis/Formatter In directory frida:/tmp/cvs-serv19545 Modified Files: DUMP.py Log Message: turn off reference identification and pretty printing by default such that the DUMP can be used more easily with 'diff' Index: DUMP.py =================================================================== RCS file: /cvs/synopsis/Synopsis/Synopsis/Formatter/DUMP.py,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -d -r1.14 -r1.15 --- DUMP.py 12 Dec 2002 17:25:32 -0000 1.14 +++ DUMP.py 3 Oct 2003 14:27:33 -0000 1.15 @@ -19,6 +19,9 @@ # 02111-1307, USA. # # $Log$ +# Revision 1.15 2003/10/03 14:27:33 stefan +# turn off reference identification and pretty printing by default such that the DUMP can be used more easily with 'diff' +# # Revision 1.14 2002/12/12 17:25:32 chalky # Implemented Include support for C++ parser. A few other minor fixes. # @@ -62,7 +65,7 @@ from Synopsis.Core import Type, AST verbose = 0 class Dumper: - def __init__(self): + def __init__(self, identify, pretty): self.handlers = { types.NoneType : self.visitNone, types.TypeType : self.visitType, @@ -75,6 +78,8 @@ class Dumper: types.DictType : self.visitDict, types.InstanceType : self.visitInstance, } + self.identify = identify + self.pretty = pretty self.clear() def clear(self): self.indent_level = 0 @@ -105,11 +110,12 @@ class Dumper: if self.visited.has_key(i): if t == types.InstanceType: t = obj.__class__.__name__+" instance" if hasattr(obj, 'name'): - self.write(""%(t,i,string.join(obj.name(),"::"))) + ident = self.identify and '( %d ) '%i or '' + self.write(""%(t,ident,string.join(obj.name(),"::"))) elif hasattr(obj, 'filename'): - self.write(""%(t,i,obj.filename())) + self.write(""%(t,ident,obj.filename())) else: - self.write(""%(t,i)) + self.write(""%(t,ident)) return if self.handlers.has_key(t): self.handlers[t](obj) @@ -220,10 +226,8 @@ class Dumper: obj.is_next(), obj.target().filename())) return self.visited[id(obj)] = None - self.write("[1m%s.%s[m = "%( - obj.__class__.__module__, - obj.__class__.__name__ - )) + template = self.pretty and "[1m%s.%s[m = " or "%s.%s = " + self.write(template%(obj.__class__.__module__,obj.__class__.__name__)) self.visitDict(obj.__dict__, self._instAttr) def usage(): @@ -234,32 +238,38 @@ def usage(): -d Show declarations -t Show types -f Show forwards also + -i identify referenced objects + -p enable pretty printing (If none of -d, -t or -f specified, will default to -d, -t) """ def __parseArgs(args): global output, verbose, show_decls, show_types, show_forwards, show_files + global identify, pretty # Set defaults output = sys.stdout show_decls = 0 show_types = 0 show_forwards = 0 show_files = 1 + identify = 0 + pretty = 0 try: - opts,remainder = getopt.getopt(args, "o:vdtf") + opts,remainder = getopt.getopt(args, "o:vdtfip") except getopt.error, e: sys.stderr.write("Error in arguments: " + str(e) + "\n") sys.exit(1) for opt in opts: o,a = opt - if o == "-o": output = open(a, "w") elif o == "-v": verbose = 1 elif o == "-d": show_decls = 1 elif o == "-t": show_types = 1 elif o == "-f": show_forwards = 1 + elif o == "-i": identify = 1 + elif o == "-p": pretty = 1 # Consolidate - if no show_ selected, show decls and types if not (show_decls or show_types or show_forwards): @@ -272,7 +282,7 @@ def format(args, ast, config_obj): #formatter = ASCIIFormatter(output) #for type in dictionary: # type.output(formatter) - dumper = Dumper() + dumper = Dumper(identify, pretty) show_sourcefiles = 0 if show_decls: print "*** Declarations:" From stefan at synopsis.fresco.org Fri Oct 3 14:47:56 2003 From: stefan at synopsis.fresco.org (Stefan Seefeld) Date: Wed Mar 2 21:06:36 2005 Subject: [Synopsis-changes] Synopsis/Synopsis/Synopsis/Formatter DUMP.py,1.15,1.16 Message-ID: Update of /cvs/synopsis/Synopsis/Synopsis/Formatter In directory frida:/tmp/cvs-serv20023/Synopsis/Formatter Modified Files: DUMP.py Log Message: let DUMP finally respect the '-o' option Index: DUMP.py =================================================================== RCS file: /cvs/synopsis/Synopsis/Synopsis/Formatter/DUMP.py,v retrieving revision 1.15 retrieving revision 1.16 diff -u -p -d -r1.15 -r1.16 --- DUMP.py 3 Oct 2003 14:27:33 -0000 1.15 +++ DUMP.py 3 Oct 2003 14:47:54 -0000 1.16 @@ -19,6 +19,9 @@ # 02111-1307, USA. # # $Log$ +# Revision 1.16 2003/10/03 14:47:54 stefan +# let DUMP finally respect the '-o' option +# # Revision 1.15 2003/10/03 14:27:33 stefan # turn off reference identification and pretty printing by default such that the DUMP can be used more easily with 'diff' # @@ -65,7 +68,7 @@ from Synopsis.Core import Type, AST verbose = 0 class Dumper: - def __init__(self, identify, pretty): + def __init__(self, output, identify, pretty): self.handlers = { types.NoneType : self.visitNone, types.TypeType : self.visitType, @@ -78,6 +81,7 @@ class Dumper: types.DictType : self.visitDict, types.InstanceType : self.visitInstance, } + self.output = output self.identify = identify self.pretty = pretty self.clear() @@ -94,10 +98,10 @@ class Dumper: self.write(text) def write(self, text): if self.newline: - sys.stdout.write("\n") - sys.stdout.write(self.indent_string) + self.output.write("\n") + self.output.write(self.indent_string) self.newline = 0 - sys.stdout.write(str(text)) + self.output.write(str(text)) def indent(self, str=" "): self.indent_level = self.indent_level + 1 self.indent_string = self.indent_string+str @@ -282,17 +286,17 @@ def format(args, ast, config_obj): #formatter = ASCIIFormatter(output) #for type in dictionary: # type.output(formatter) - dumper = Dumper(identify, pretty) + dumper = Dumper(output, identify, pretty) show_sourcefiles = 0 if show_decls: - print "*** Declarations:" + output.write("*** Declarations:\n") dumper.visit(ast.declarations()) if show_types: - if show_decls: print "\n\n\n" - print "*** Types:" + if show_decls: output.write("\n\n\n") + output.write("*** Types:\n") dumper.visit(ast.types()) if show_files: show_sourcefiles = 1 - print "\n\n\n" - print "*** Files:" + output.write("\n\n\n") + output.write("*** Files:\n") dumper.visit(ast.files()) From stefan at synopsis.fresco.org Fri Oct 3 14:56:14 2003 From: stefan at synopsis.fresco.org (Stefan Seefeld) Date: Wed Mar 2 21:06:36 2005 Subject: [Synopsis-changes] Synopsis/Synopsis/tests - New directory Message-ID: Update of /cvs/synopsis/Synopsis/tests In directory frida:/tmp/cvs-serv20271/tests Log Message: Directory /cvs/synopsis/Synopsis/tests added to the repository From stefan at synopsis.fresco.org Fri Oct 3 14:56:28 2003 From: stefan at synopsis.fresco.org (Stefan Seefeld) Date: Wed Mar 2 21:06:36 2005 Subject: [Synopsis-changes] Synopsis/Synopsis/tests/Parser - New directory Message-ID: Update of /cvs/synopsis/Synopsis/tests/Parser In directory frida:/tmp/cvs-serv20291/tests/Parser Log Message: Directory /cvs/synopsis/Synopsis/tests/Parser added to the repository From stefan at synopsis.fresco.org Fri Oct 3 14:56:41 2003 From: stefan at synopsis.fresco.org (Stefan Seefeld) Date: Wed Mar 2 21:06:36 2005 Subject: [Synopsis-changes] Synopsis/Synopsis/tests/Parser/C++ - New directory Message-ID: Update of /cvs/synopsis/Synopsis/tests/Parser/C++ In directory frida:/tmp/cvs-serv20305/tests/Parser/C++ Log Message: Directory /cvs/synopsis/Synopsis/tests/Parser/C++ added to the repository From stefan at synopsis.fresco.org Fri Oct 3 14:56:53 2003 From: stefan at synopsis.fresco.org (Stefan Seefeld) Date: Wed Mar 2 21:06:36 2005 Subject: [Synopsis-changes] Synopsis/Synopsis/tests/Parser/C++/src - New directory Message-ID: Update of /cvs/synopsis/Synopsis/tests/Parser/C++/src In directory frida:/tmp/cvs-serv20318/tests/Parser/C++/src Log Message: Directory /cvs/synopsis/Synopsis/tests/Parser/C++/src added to the repository From stefan at synopsis.fresco.org Fri Oct 3 14:57:18 2003 From: stefan at synopsis.fresco.org (Stefan Seefeld) Date: Wed Mar 2 21:06:36 2005 Subject: [Synopsis-changes] Synopsis/Synopsis/tests/Parser/C++/expected - New directory Message-ID: Update of /cvs/synopsis/Synopsis/tests/Parser/C++/expected In directory frida:/tmp/cvs-serv20336/tests/Parser/C++/expected Log Message: Directory /cvs/synopsis/Synopsis/tests/Parser/C++/expected added to the repository From stefan at synopsis.fresco.org Fri Oct 3 14:58:13 2003 From: stefan at synopsis.fresco.org (Stefan Seefeld) Date: Wed Mar 2 21:06:37 2005 Subject: [Synopsis-changes] Synopsis/Synopsis/tests/Parser/C++/src cast.cc,NONE,1.1 comment_proximity.cc,NONE,1.1 comments.cc,NONE,1.1 concat.cc,NONE,1.1 condition.cc,NONE,1.1 for.cc,NONE,1.1 forward_class.cc,NONE,1.1 func.cc,NONE,1.1 func_ptr.cc,NONE,1.1 func_template.cc,NONE,1.1 func_template_arg.cc,NONE,1.1 if.cc,NONE,1.1 koenig.cc,NONE,1.1 macro.cc,NONE,1.1 operator.cc,NONE,1.1 static_cast.cc,NONE,1.1 std.cc,NONE,1.1 template.cc,NONE,1.1 template_spec.cc,NONE,1.1 template_spec2.cc,NONE,1.1 try.cc,NONE,1.1 typename.cc,NONE,1.1 using.cc,NONE,1.1 using2.cc,NONE,1.1 using3.cc,NONE,1.1 using4.cc,NONE,1.1 Message-ID: Update of /cvs/synopsis/Synopsis/tests/Parser/C++/src In directory frida:/tmp/cvs-serv20349/tests/Parser/C++/src Added Files: cast.cc comment_proximity.cc comments.cc concat.cc condition.cc for.cc forward_class.cc func.cc func_ptr.cc func_template.cc func_template_arg.cc if.cc koenig.cc macro.cc operator.cc static_cast.cc std.cc template.cc template_spec.cc template_spec2.cc try.cc typename.cc using.cc using2.cc using3.cc using4.cc Log Message: reorganize unit tests for C++ parser --- NEW FILE: cast.cc --- typedef int Foo; void func() { (Foo)1; (Foo*)1; (const Foo&)1; } --- NEW FILE: comment_proximity.cc --- // Comment at start int test1; // Test2: This should have a comment, unlike test1 // It should also have two lines int test2; /* A comment by itself * Over multiple lines. */ int test3; /* This comment should be ignored. */ /* Test4: Should have a comment * */ int test4; /* Test5: This should have a comment, unlike test 3 * Which had a gap. */ int test5; //< This should still be tail-appended! --- NEW FILE: comments.cc --- // 1. Comments Test: One line cpp test // 2. Two line cpp test // Second line of test /* 3. One line c test */ /* 4. Another c test */ /* 5. Two on one */ /* 6. line */ /* 7. Multi * line */ --- NEW FILE: concat.cc --- // According to spec, the ## operator must produce a valid PP token. // Unfortunately, no compilers known to man enforce this rule except UCPP, so // this test is to make sure it is 'fixed' to ignore the error. #define CAT(a,b) a ## b class Foo {}; void CAT(operator,+) (const Foo&, const Foo&) {} void operator CAT(+,=) (const Foo&, const Foo&) {} --- NEW FILE: condition.cc --- // Tests the ability to use a declaration in the condition of an if or switch struct X { operator bool() const {return true;} struct Y { operator bool() const {return true;} }; }; void foo() { int _i; X _x; X::Y _y; if (int i = 3) {} if (const int i = 3) {} if (const int* i = &_i) {} if (int* const i = &_i) {} if (X foo = _x) {} if (const X foo = _x) {} if (const X* foo = &_x) {} if (X* const foo = &_x) {} if (X::Y foo = _y) {} if (const X::Y foo = _y) {} if (const X::Y* foo = &_y) {} if (X::Y* const foo = &_y) {} switch (int i = 3) {} switch (const int i = 3) {} } --- NEW FILE: for.cc --- void func() { int x; for (int x = 3, y = 10; x < y; ++x) { cout << x; } } --- NEW FILE: forward_class.cc --- class X { public: void f(int); int a; }; class Y; int X::* pmi = &X::a; void (X::* pmf)(int) = &X::f; double X::* pmd; char Y::* pmc; X obj; X* pobj; void foo() { obj.*pmi = 7; // assign 7 to an integer // member of obj (obj.*pmf)(7); // call a function member of obj // with the argument 7 pobj->*pmi = 7; // assign 7 to an integer (pobj->*pmf)(7); // call a function member of obj } --- NEW FILE: func.cc --- void func(char); void func(int); void func(double); void func(const char*); void test() { func('c'); func(123); func(1.2); func("s"); } --- NEW FILE: func_ptr.cc --- // Tests function pointers typedef void PyObject; // A function which takes a func ptr as a parameter void insert(void* (*convert)(PyObject*), bool yesno); // A function which takes a func ptr as a parameter void insert(void* (*convert)(PyObject*, int), bool yesno); // A function which returns a func ptr void* (*insert2(int))(PyObject*); int main() { (void)insert2(1); } --- NEW FILE: func_template.cc --- // Test function templates // Test template arg template int func1(A a) { return 0; }; // Test template return template A func2(int i) { return 0; }; // Test template arg and return template A func2(A a) { return 0; }; // Test template arg and return w/ different types template B func2(A a) { return 0; }; // Test template arg and return w/ different types. Function declaration template B func2(A a); --- NEW FILE: func_template_arg.cc --- // Test function pointers as template arguments template struct function { }; // Test template class with function argument // (not really a template function) template struct function { }; // Test return type fptr template struct function { }; // Test return type fptr template struct function { }; --- NEW FILE: if.cc --- // If test void func() { int x = 0; if (x) cout << "Hi"; // test x = "`func()::x" if (x == 2) cout << "hi"; // test x = "`func()::x" if (!x) cout << "foo"; // test x = "`func()::x" if (x) cout << "one"; else cout << "two"; if (x) {cout << "one"; cout << "two"; } else { cout<<"three"; } } --- NEW FILE: koenig.cc --- namespace NS { struct A {}; int operator +(A, A); }; void func(int); void func(NS::A) { NS::A x, y; func(x + y); // should call func(int) } --- NEW FILE: macro.cc --- int x; #define LONGER 12345678 #define SHORTER 1234 #define LINKINSIDE x #define ARGS(a, b, c) x int A = LONGER, A2 = x; int B = SHORTER, B2 = x; int C = LINKINSIDE, C2 = x; int D = ARGS(1, 2, 3), D2 = x; --- NEW FILE: operator.cc --- struct A {}; struct B {}; A operator +(const B&, const B&); int operator +(const A&, const A&); void func(A); void func(B); void func(int); void main() { B x, y; func( (x + y) + (x + y) ); // should call func(int), test func = "func(int)" } --- NEW FILE: static_cast.cc --- #define CAT(a, b) CAT_D(a, b) #define CAT_D(a, b) a ## b #define AB(x, y) CAT(x, y) // There should be a variable XY here int CAT(A, B)(X, Y) ; --- NEW FILE: std.cc --- #include namespace Foo { void func(std::vector array); } --- NEW FILE: template.cc --- struct Object { float f; double func(); Object(); Object(const Object&); Object& operator = (const Object&); }; template class list { T* m_array; int m_size; public: list(); list(T*); T& operator [] (int index) { return m_array[index]; } int size() { return m_size; } void replace(int index, const T& with) { m_array[index] = with; } }; void main() { list

User Manual

Synopsis - User Manual

Synopsis Developer Reference Manual

Synopsis - Developer Reference Manual