gnustep/libs-gsweb
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gsweb.git synced 2025-02-23 19:51:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* GSWeb.framework/GSWTemplateParserANTLR.h:

Browse source 
o removed GSWPageDef* includes
* GSWeb.framework/GSWTemplateParserANTLR.m:
  o renamed defintions* to declarations*
  o replaced GSWPageDefElement by GSWDeclaration


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@18907 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
mguesdon 2004-03-25 08:36:00 +00:00
parent a6cc8c4626
commit 3f2a015c2e
2 changed files with 15 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
GSWeb.framework/GSWTemplateParserANTLR.h
View file

@ -1,6 +1,6 @@
/** GSWTemplateParserANTLR.h - <title>GSWeb: Class GSWTemplateParserANTLR</title> /** GSWTemplateParserANTLR.h - <title>GSWeb: Class GSWTemplateParserANTLR</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc. Copyright (C) 1999-2004 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com> Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Mar 1999 Date: Mar 1999
@ -36,9 +36,6 @@
#include <gsantlr/ANTLRTextStreams.h> #include <gsantlr/ANTLRTextStreams.h>
#include "GSWTemplateParser.h" #include "GSWTemplateParser.h"
#include "GSWHTMLTokenTypes.h" #include "GSWHTMLTokenTypes.h"
#include "GSWPageDefLexer.h"
#include "GSWPageDefParser.h"
#include "GSWPageDefParserExt.h"
#include "GSWHTMLAttrLexer.h" #include "GSWHTMLAttrLexer.h"
#include "GSWHTMLAttrParser.h" #include "GSWHTMLAttrParser.h"
#include "GSWHTMLAttrParserExt.h" #include "GSWHTMLAttrParserExt.h"

28
GSWeb.framework/GSWTemplateParserANTLR.m
View file

@ -1,6 +1,6 @@
/** GSWTemplateParserANTLR.m - <title>GSWeb: Class GSWTemplateParserANTLR</title> /** GSWTemplateParserANTLR.m - <title>GSWeb: Class GSWTemplateParserANTLR</title>
Copyright (C) 1999-2003 Free Software Foundation, Inc. Copyright (C) 1999-2004 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com> Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Mar 1999 Date: Mar 1999
@ -56,7 +56,7 @@ RCS_ID("$Id$")
NSDebugMLLog(@"low",@"template named:%@ frameworkName:%@ pageDefString=%@", NSDebugMLLog(@"low",@"template named:%@ frameworkName:%@ pageDefString=%@",
_templateName, _templateName,
_frameworkName, _frameworkName,
_definitionsString); _declarationsString);
//TODO remove //TODO remove
/* /*
[ANTLRCharBuffer setTraceFlag_LA:YES]; [ANTLRCharBuffer setTraceFlag_LA:YES];
@ -338,16 +338,16 @@ RCS_ID("$Id$")
} }
else else
{ {
GSWPageDefElement* pageDefElement=[_definitions objectForKey:name]; GSWDeclaration* declaration=[_declarations objectForKey:name];
NSDebugMLLog(@"low",@"pageDefElement:[%@]", NSDebugMLLog(@"low",@"declaration:[%@]",
pageDefElement); declaration);
NSDebugMLLog(@"low",@"GSWeb Tag pageDefElement:[%@]", NSDebugMLLog(@"low",@"GSWeb Tag declaration:[%@]",
pageDefElement); declaration);
if (pageDefElement) if (declaration)
{ {
NSDictionary* _associations=[pageDefElement associations]; NSDictionary* _associations=[declaration associations];
NSString* className=nil; NSString* className=nil;
className=[pageDefElement className]; className=[declaration type];
NSDebugMLLog(@"low",@"GSWeb Tag className:[%@]", NSDebugMLLog(@"low",@"GSWeb Tag className:[%@]",
className); className);
if (className) if (className)
@ -385,12 +385,12 @@ RCS_ID("$Id$")
template:[[[GSWHTMLStaticGroup alloc]initWithContentElements:children]autorelease] template:[[[GSWHTMLStaticGroup alloc]initWithContentElements:children]autorelease]
languages:_languages]; languages:_languages];
if (element) if (element)
[element setDefinitionName:[pageDefElement elementName]]; [element setDeclarationName:[declaration name]];
else else
{ {
ExceptionRaise(@"GSWTemplateParser", ExceptionRaise(@"GSWTemplateParser",
@"GSWTemplateParser: Creation failed for element named:%@ className:%@ in template named %@", @"GSWTemplateParser: Creation failed for element named:%@ className:%@ in template named %@",
[pageDefElement elementName], [declaration name],
className, className,
_templateName); _templateName);
}; };
@ -398,9 +398,9 @@ RCS_ID("$Id$")
else else
{ {
ExceptionRaise(@"GSWTemplateParser", ExceptionRaise(@"GSWTemplateParser",
@"GSWTemplateParser: No class name in page definition for tag named:%@ pageDefElement=%@ in template named %@", @"GSWTemplateParser: No class name in page definition for tag named:%@ declaration=%@ in template named %@",
name, name,
pageDefElement, declaration,
_templateName); _templateName);
}; };
} }