git.megacz.com Git - ghc-hetmet.git/search

2006-10-21	Manuel M T Chakravarty	Fix export of associated families with new name parent...	commit \| commitdiff \| tree
2006-10-20	Manuel M T Chakravarty	Fix processing of imports involving ATs with the new...	commit \| commitdiff \| tree
2006-10-19	Manuel M T Chakravarty	Fix family instance bug due to the name parent elimination	commit \| commitdiff \| tree
2006-10-19	Manuel M T Chakravarty	Fix show-iface for family instances & add debug ppr...	commit \| commitdiff \| tree
2006-10-18	Manuel M T Chakravarty	Cross-module consistency check for family instances	commit \| commitdiff \| tree
2006-10-16	Manuel M T Chakravarty	Stage 2 fix to "Keep track of family instance modules"	commit \| commitdiff \| tree
2006-10-13	Manuel M T Chakravarty	Keep track of family instance modules	commit \| commitdiff \| tree
2006-10-12	Manuel M T Chakravarty	Overlap check for family instances def'd in current...	commit \| commitdiff \| tree
2006-10-10	Manuel M T Chakravarty	Removed unused unwrapFamInstBody from MkId	commit \| commitdiff \| tree
2006-10-10	Manuel M T Chakravarty	Rough matches for family instances	commit \| commitdiff \| tree
2006-09-21	Manuel M T Chakravarty	Fix Linker import when BREAKPOINT is off	commit \| commitdiff \| tree
2006-09-21	Manuel M T Chakravarty	Extend IfaceSyn.eqIfTc to cover type kind variants...	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Correct substitution into theta types (after merge)	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Fix import list of TcTyClsDecls after merge	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Adding FamInstEnv & FamInst modules	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Adapt FC-code in TcUnify to pre-subsumption ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Some more ASSERTs ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	SPJ's fix to resolve conflict in instFun ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Adjust code from manual merges ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Adapt TcFix imports ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Basic set up for global family instance environment ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Import/export of data constructors in family instances ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Use smart lookup for tycons ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Fix type checking of imported data instances ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Fix category of representation tycon ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Option -findexed-types ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Get of fam inst index in ifaces ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Clean up and refactor in SimplUtils.mkCase1 (identity... ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	ATs are now implicitTyThings ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Straightened out implicit coercions for indexed types ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Fixed two bugs concerning fanilies ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Indexed newtypes ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Check category of type instances and some newtype family... ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Better error message for indexes that must be variables ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Checking conformance of AT indexes with instance heads ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Warn of missing ATs and complain about bad ATs ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Check that AT instance is in a class ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Kind sig for toplevel family decls is optional ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Fixed bug in coercion for indexed data types ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Pattern matching of indexed data types ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Introduce coercions for data instance decls ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Fixed two data family bugs ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Fix the tyvars used for data con signatures ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Extend TyCons and DataCons to represent data instance... ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Fix TcSplice after some type family related changes ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Make sure ATs are included into the temporary env for... ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Extend Class.Class to include the TyCons of ATs ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Fix kind lookup in kcIdxTyPats ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Extended TyCon and friends to represent family declarations ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Kind and type checking of indexed types ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Another comment ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Add missing co_vars to tcIfaceDataAlt ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Comments only ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Small refactoring ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	TAG HEAD merge 6 Aug 06 completed	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Missing change re additional info in TcTyThing ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Complete OccName->FS change in TcIface ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Missing imports in CoreUtils ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Removed spurious + due to manual patching ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Makefile comment ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Fix newtype deriving bug ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Include the existential dictionaries in dataConOrigInstPat ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Comments about datacon worker and wrappers ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Make newtype Coercion eta-contract if the tails of... ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Flip direction of newtype coercions, fix some comments ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Chagne newtype wrapper into worker ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Clean up unused imports, definitions and arguments ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Fix assertion and default case for GADT record selectors ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	make dataConInstPat take a list of FastStrings rather... ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Just clean-up, no functional changes ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Get rid of special case for Vanilla tycon record selectors... ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Fix problem with selectors for GADT records with unboxed... ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Make sym coercion smart constructor smarter, add comments ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Refactoring in TcGadt ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Add some invariant checking for refinements ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Minor tidying up ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Fix GADT refinement fix-pointing, add ASSERTs and a... ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Remove bogus ASSERT from MkId ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Fix bug in type checking interface DataAlts ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	fix default case filling-in for GADTs ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	fix big-lambda eta expansion, add comments ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Fix Lint for alts involving shadowing of type variables... ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Fix a couple of stage-2 bogosities ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	fixing record selectors ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	GADT selector bugfix, bits of cleanup ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	fix some GADT record selector bugs (still some remaining) ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	clean up Coercion kinding functions, rename coercionKindTyConApp ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Better pretty printing for CoPat ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Make data con wrappers for GADTs express the user type... ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Comments only ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	fix bugs, add boolean flag to identify coercion variables ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	fix some coercion kind representation things, extend... ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	fixed bug in product unboxing ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	finished product unboxing through newtypes and proper... ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Comment ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	towards unboxing through newtypes ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	fix out-of-scope vars ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	Complete the evidence generation for GADTs ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	bugs ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
2006-09-20	Manuel M T Chakravarty	some bug-fixes, newtype deriving might work now ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> ...2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au>	commit \| commitdiff \| tree
next

Glasgow Haskell Compiler with heterogeneous metaprogramming (generalized arrows and modal types)

RSS Atom